commit b1ad2190a2ef5f9529176075d7b3318e6f39e35c
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Sep 30 10:35:43 2015 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Fri Oct 02 11:04:01 2015 +0900
tree 787b8bc1f179ada7a965bffce31a52afedeab401
parent f231db11a2f7c2cf28c1228146b0c087c4be882a

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

subcmds/sync.py

diff --git a/subcmds/sync.py b/subcmds/sync.py
index a99d7e7..dc6604c 100644
--- a/subcmds/sync.py
+++ b/subcmds/sync.py
@@ -925,7 +925,10 @@
           tmpcookiefile.flush()
 
           cookiejar = cookielib.MozillaCookieJar(tmpcookiefile.name)
-          cookiejar.load()
+          try:
+            cookiejar.load()
+          except cookielib.LoadError:
+            cookiejar = cookielib.CookieJar()
         finally:
           tmpcookiefile.close()
       else: