android/git-repo
1
Fork 0
mirror of https://gerrit.googlesource.com/git-repo synced 2024-12-21 07:16:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Part of the cleanup path for _Init is removing the .repo
directory. However, _Init can fail before creating the .repo directory,
so trying to remove it raises another exception:

    fatal: invalid branch name 'refs/changes/53/55053/4'
    Traceback (most recent call last):
      File "/home/mitchelh/bin/repo", line 775, in <module>
        main(sys.argv[1:])
      File "/home/mitchelh/bin/repo", line 749, in main
        os.rmdir(repodir)
    OSError: [Errno 2] No such file or directory: '.repo'

Fix this by only removing .repo if it actually exists.

Change-Id: Ia251d29e9c73e013eb296501d11c36263457e235
This commit is contained in:
Mitchel Humpherys 2014-03-12 10:48:15 -07:00
parent 53e902a19b
commit eb5acc9ae9
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
repo
View File

@ -114,6 +114,7 @@ import errno
import optparse import optparse
import os import os
import re import re
import shutil
import stat import stat
import subprocess import subprocess
import sys import sys
@ -741,12 +742,7 @@ def main(orig_args):
try: try:
_Init(args) _Init(args)
except CloneFailure: except CloneFailure:
for root, dirs, files in os.walk(repodir, topdown=False): shutil.rmtree(repodir, ignore_errors=True)
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)
sys.exit(1) sys.exit(1)
repo_main, rel_repo_dir = _FindRepo() repo_main, rel_repo_dir = _FindRepo()
else: else: