commit 5a7c3afa73c99ab07c60bb65f5ec57423cac4282
author David Pursehouse <david.pursehouse@sonymobile.com> Fri Apr 18 00:06:07 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 18 00:06:08 2014 +0000
tree 09e995846e7ff06d382a56c3942e9b3f7d161dac
parent e81bc030bba802627fd34af472fc0cf451e17c1d
parent eb5acc9ae9148b21afa82b63daec7753b284c03c

Merge "Don't try to remove .repo if it doesn't exist"

repo

diff --git a/repo b/repo
index 768f11f..b8c414b 100755
--- a/repo
+++ b/repo
@@ -114,6 +114,7 @@
 import optparse
 import os
 import re
+import shutil
 import stat
 import subprocess
 import sys
@@ -741,12 +742,7 @@
       try:
         _Init(args)
       except CloneFailure:
-        for root, dirs, files in os.walk(repodir, topdown=False):
-          for name in files:
-            os.remove(os.path.join(root, name))
-          for name in dirs:
-            os.rmdir(os.path.join(root, name))
-        os.rmdir(repodir)
+        shutil.rmtree(repodir, ignore_errors=True)
         sys.exit(1)
       repo_main, rel_repo_dir = _FindRepo()
     else: