summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
Diffstat (limited to 'project.py')
-rw-r--r--project.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/project.py b/project.py
index 2f83d796..2ab0b389 100644
--- a/project.py
+++ b/project.py
@@ -2197,7 +2197,7 @@ class Project(object):
2197 ret = prunecmd.Wait() 2197 ret = prunecmd.Wait()
2198 if ret: 2198 if ret:
2199 break 2199 break
2200 output_redir.write('retrying fetch after pruning remote branches') 2200 print('retrying fetch after pruning remote branches', file=output_redir)
2201 # Continue right away so we don't sleep as we shouldn't need to. 2201 # Continue right away so we don't sleep as we shouldn't need to.
2202 continue 2202 continue
2203 elif current_branch_only and is_sha1 and ret == 128: 2203 elif current_branch_only and is_sha1 and ret == 128:
@@ -2210,10 +2210,11 @@ class Project(object):
2210 break 2210 break
2211 2211
2212 # Figure out how long to sleep before the next attempt, if there is one. 2212 # Figure out how long to sleep before the next attempt, if there is one.
2213 if not verbose: 2213 if not verbose and gitcmd.stdout:
2214 output_redir.write('\n%s:\n%s' % (self.name, gitcmd.stdout)) 2214 print('\n%s:\n%s' % (self.name, gitcmd.stdout), end='', file=output_redir)
2215 if try_n < retry_fetches - 1: 2215 if try_n < retry_fetches - 1:
2216 output_redir.write('sleeping %s seconds before retrying' % retry_cur_sleep) 2216 print('%s: sleeping %s seconds before retrying' % (self.name, retry_cur_sleep),
2217 file=output_redir)
2217 time.sleep(retry_cur_sleep) 2218 time.sleep(retry_cur_sleep)
2218 retry_cur_sleep = min(retry_exp_factor * retry_cur_sleep, 2219 retry_cur_sleep = min(retry_exp_factor * retry_cur_sleep,
2219 MAXIMUM_RETRY_SLEEP_SEC) 2220 MAXIMUM_RETRY_SLEEP_SEC)