Chad has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/404527 )

Change subject: Simplify/speed up clean plugin submodule handling
......................................................................

Simplify/speed up clean plugin submodule handling

Change-Id: I4f878c0a645d3ce6b556a441b9a139997455ca14
---
M scap/plugins/clean.py
1 file changed, 1 insertion(+), 9 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/27/404527/1

diff --git a/scap/plugins/clean.py b/scap/plugins/clean.py
index 5b9a175..d18145c 100644
--- a/scap/plugins/clean.py
+++ b/scap/plugins/clean.py
@@ -82,16 +82,8 @@
                                 'wmf/%s' % branch]
             with log.Timer('prune-git-branches', self.get_stats()):
                 # Prune all the submodules' remote branches
-                for submodule in git.list_submodules(stage_dir):
-                    submodule_path = submodule.lstrip(' ').split(' ')[1]
-                    with utils.cd(os.path.join(stage_dir, submodule_path)):
-                        if subprocess.call(gerrit_prune_cmd) != 0:
-                            logger.info(
-                                'Failed to prune submodule branch for %s' %
-                                submodule)
-
-                # Prune core last
                 with utils.cd(stage_dir):
+                    subprocess.check_output('git submodule foreach "git push 
origin --quiet --delete wmf/%s ||:"' % branch, shell=True)
                     if subprocess.call(gerrit_prune_cmd) != 0:
                         logger.info('Failed to prune core branch')
             with log.Timer('removing-local-copy'):

-- 
To view, visit https://gerrit.wikimedia.org/r/404527
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f878c0a645d3ce6b556a441b9a139997455ca14
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to