aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-01-18 09:22:30 -0500
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-01-18 09:22:30 -0500
commit14df996bdc4721bc5b5709485174eff511de6141 (patch)
tree6a83908916272e356ba646f5897a7b3ff8af30c9
parentaafb54eb71a2539319a6d67c65e97a4b0838ed34 (diff)
downloadgrokmirror-14df996bdc4721bc5b5709485174eff511de6141.tar.gz
Don't force a pull after fix_params
If there is no difference in fingerprints, there is no need to force a pull. Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rwxr-xr-xgrokmirror/pull.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/grokmirror/pull.py b/grokmirror/pull.py
index 605ba06..dfc9a0a 100755
--- a/grokmirror/pull.py
+++ b/grokmirror/pull.py
@@ -331,19 +331,19 @@ def pull_worker(config, q_pull, q_spa, q_done):
logger.info(' purge: %s', gitdir)
shutil.rmtree(fullpath)
+ if action == 'fix_params':
+ logger.info(' reconfig: %s', gitdir)
+ set_repo_params(fullpath, repoinfo)
+
if action == 'fix_remotes':
logger.info(' reorigin: %s', gitdir)
success = fix_remotes(toplevel, gitdir, site, config)
if success:
- action = 'fix_params'
+ set_repo_params(fullpath, repoinfo)
+ action = 'pull'
else:
success = False
- if action == 'fix_params':
- logger.info(' reconfig: %s', gitdir)
- set_repo_params(fullpath, repoinfo)
- action = 'pull'
-
if action == 'reclone':
logger.info(' reclone: %s', gitdir)
try: