summaryrefslogtreecommitdiffstats
path: root/project.py
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@sonymobile.com>2015-06-02 00:14:43 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-06-02 00:14:43 +0000
commit472ce9f5fa61a953b9275cfe36b8b86f3dad5c73 (patch)
treebce9a6d31b48a6cde2bf0f09b34e7fd3923500d7 /project.py
parent0184dcc510969d6e7cb2525da8e7e2a87ed5f012 (diff)
parentc4b301f988ad7499257538070f78f5e50e61b3ae (diff)
downloadgit-repo-472ce9f5fa61a953b9275cfe36b8b86f3dad5c73.tar.gz
Merge changes I32da12c2,Ie4a65b3e
* changes: Skip sleep and retry if git remote update exits with a signal Catch exceptions in project list generator
Diffstat (limited to 'project.py')
-rw-r--r--project.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/project.py b/project.py
index 86e2756d..610dd5a7 100644
--- a/project.py
+++ b/project.py
@@ -1909,6 +1909,9 @@ class Project(object):
1909 # mode, we just tried sync'ing from the upstream field; it doesn't exist, thus 1909 # mode, we just tried sync'ing from the upstream field; it doesn't exist, thus
1910 # abort the optimization attempt and do a full sync. 1910 # abort the optimization attempt and do a full sync.
1911 break 1911 break
1912 elif ret < 0:
1913 # Git died with a signal, exit immediately
1914 break
1912 time.sleep(random.randint(30, 45)) 1915 time.sleep(random.randint(30, 45))
1913 1916
1914 if initial: 1917 if initial: