diff options
author | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-09-30 10:35:43 +0900 |
---|---|---|
committer | David Pursehouse <david.pursehouse@sonymobile.com> | 2015-10-02 11:04:01 +0900 |
commit | b1ad2190a2ef5f9529176075d7b3318e6f39e35c (patch) | |
tree | 787b8bc1f179ada7a965bffce31a52afedeab401 /subcmds/sync.py | |
parent | f231db11a2f7c2cf28c1228146b0c087c4be882a (diff) | |
download | git-repo-b1ad2190a2ef5f9529176075d7b3318e6f39e35c.tar.gz |
Sync: Don't fail when git cookies can't be loaded
If the git cookies file fails to load, use a default
cookie jar instead.
Bug: Issue 207
Change-Id: I7cb326c204f2784ab4dbd13801b3186667af5b78
Diffstat (limited to 'subcmds/sync.py')
-rw-r--r-- | subcmds/sync.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index a99d7e74..dc6604cc 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -925,7 +925,10 @@ class PersistentTransport(xmlrpc.client.Transport): | |||
925 | tmpcookiefile.flush() | 925 | tmpcookiefile.flush() |
926 | 926 | ||
927 | cookiejar = cookielib.MozillaCookieJar(tmpcookiefile.name) | 927 | cookiejar = cookielib.MozillaCookieJar(tmpcookiefile.name) |
928 | cookiejar.load() | 928 | try: |
929 | cookiejar.load() | ||
930 | except cookielib.LoadError: | ||
931 | cookiejar = cookielib.CookieJar() | ||
929 | finally: | 932 | finally: |
930 | tmpcookiefile.close() | 933 | tmpcookiefile.close() |
931 | else: | 934 | else: |