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

Merge "Fix removing broken symlink in reference dir"

Browse Source
This commit is contained in:
David Pursehouse 2016-12-06 07:51:01 +00:00 committed by Gerrit Code Review
commit bb9c42cf1d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
project.py
View File

@ -2442,6 +2442,14 @@ class Project(object):
if name in symlink_dirs and not os.path.lexists(src): if name in symlink_dirs and not os.path.lexists(src):
os.makedirs(src) os.makedirs(src)
if name in to_symlink:
os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
elif copy_all and not os.path.islink(dst):
if os.path.isdir(src):
shutil.copytree(src, dst)
elif os.path.isfile(src):
shutil.copy(src, dst)
# If the source file doesn't exist, ensure the destination # If the source file doesn't exist, ensure the destination
# file doesn't either. # file doesn't either.
if name in symlink_files and not os.path.lexists(src): if name in symlink_files and not os.path.lexists(src):
@ -2450,13 +2458,6 @@ class Project(object):
except OSError: except OSError:
pass pass
if name in to_symlink:
os.symlink(os.path.relpath(src, os.path.dirname(dst)), dst)
elif copy_all and not os.path.islink(dst):
if os.path.isdir(src):
shutil.copytree(src, dst)
elif os.path.isfile(src):
shutil.copy(src, dst)
except OSError as e: except OSError as e:
if e.errno == errno.EPERM: if e.errno == errno.EPERM:
raise DownloadError('filesystem must support symlinks') raise DownloadError('filesystem must support symlinks')