diff options
| -rw-r--r-- | project.py | 10 |
1 files changed, 6 insertions, 4 deletions
| @@ -2135,8 +2135,9 @@ class Project(object): | |||
| 2135 | break | 2135 | break |
| 2136 | 2136 | ||
| 2137 | # Retry later due to HTTP 429 Too Many Requests. | 2137 | # Retry later due to HTTP 429 Too Many Requests. |
| 2138 | elif ('error:' in gitcmd.stderr and | 2138 | elif (gitcmd.stdout and |
| 2139 | 'HTTP 429' in gitcmd.stderr): | 2139 | 'error:' in gitcmd.stdout and |
| 2140 | 'HTTP 429' in gitcmd.stdout): | ||
| 2140 | if not quiet: | 2141 | if not quiet: |
| 2141 | print('429 received, sleeping: %s sec' % retry_cur_sleep, | 2142 | print('429 received, sleeping: %s sec' % retry_cur_sleep, |
| 2142 | file=sys.stderr) | 2143 | file=sys.stderr) |
| @@ -2149,8 +2150,9 @@ class Project(object): | |||
| 2149 | 2150 | ||
| 2150 | # If this is not last attempt, try 'git remote prune'. | 2151 | # If this is not last attempt, try 'git remote prune'. |
| 2151 | elif (try_n < retry_fetches - 1 and | 2152 | elif (try_n < retry_fetches - 1 and |
| 2152 | 'error:' in gitcmd.stderr and | 2153 | gitcmd.stdout and |
| 2153 | 'git remote prune' in gitcmd.stderr and | 2154 | 'error:' in gitcmd.stdout and |
| 2155 | 'git remote prune' in gitcmd.stdout and | ||
| 2154 | not prune_tried): | 2156 | not prune_tried): |
| 2155 | prune_tried = True | 2157 | prune_tried = True |
| 2156 | prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True, | 2158 | prunecmd = GitCommand(self, ['remote', 'prune', name], bare=True, |
