commit 99482ae58a74e236fb40b65c267163a5690f39e1
author Ulrik Sjölin <ulrik.sjolin@sonyericsson.com> Fri Oct 29 08:23:30 2010 -0700
committer Shawn O. Pearce <sop@google.com> Fri Oct 29 08:25:04 2010 -0700
tree 634b25fb07a6e37cafb9c0273bf1a3eb7297ac2f
parent ec1df9b7f6310ce5dd9432b727eb9f7bde9f2796

Only delete corrupt pickle config files if they exist

os.remove() raises OSError if the file being removed doesn't exist.
Check before calling to ensure we don't raise a useless exception
on an already deleted file.

Change-Id: I44c1c7dd97a47fcab8afb6c18fdf179158b6dab7
Signed-off-by: Shawn O. Pearce <sop@google.com>

git_config.py

diff --git a/git_config.py b/git_config.py
index 138470c..8e3dfb1 100644
--- a/git_config.py
+++ b/git_config.py
@@ -257,9 +257,11 @@
       finally:
         fd.close()
     except IOError:
-      os.remove(self._pickle)
+      if os.path.exists(self._pickle):
+        os.remove(self._pickle)
     except cPickle.PickleError:
-      os.remove(self._pickle)
+      if os.path.exists(self._pickle):
+        os.remove(self._pickle)
 
   def _ReadGit(self):
     """