From 882c8c49beb214315b8c97b946edee00855273fb Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Tue, 6 Mar 2018 15:07:23 +0100
Subject: [PATCH] Update gitignore when importing a puppet module
---
bin/import-puppet-module | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/bin/import-puppet-module b/bin/import-puppet-module
index e7c9705..29adeef 100755
--- a/bin/import-puppet-module
+++ b/bin/import-puppet-module
@@ -164,6 +164,20 @@ def update_mrconfig(module_name, phabricator_repo, upstream_repo):
write_mrconfig(swh_repos, extra_repos)
+ ret = copy.deepcopy(swh_repos)
+ ret.update(extra_repos)
+ return ret
+
+
+def update_gitignore(modules):
+ with tempfile.NamedTemporaryFile(mode='w+', dir='.', delete=False) as f:
+ for module in modules:
+ if module == 'DEFAULT':
+ continue
+ print('/%s/' % module, file=f)
+
+ os.rename(f.name, '.gitignore')
+
if __name__ == '__main__':
if len(sys.argv) != 2:
@@ -179,8 +193,9 @@ if __name__ == '__main__':
phabricator = Phabricator()
phabricator.connect()
phabricator.update_interfaces()
- ret = create_phab_repo(phabricator, module_name, release_meta)
- repo_id = ret['object']['id']
+ repo = create_phab_repo(phabricator, module_name, release_meta)
+ repo_id = repo['object']['id']
wait_phab_repo(phabricator, repo_id)
clone_and_push_repo(module_name, phabricator_repo, upstream_repo)
- update_mrconfig(module_name, phabricator_repo, upstream_repo)
+ repos = update_mrconfig(module_name, phabricator_repo, upstream_repo)
+ update_gitignore(repos)
--
GitLab