zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

link_tree: support ignoring conflicts

Browse Source
This commit is contained in:
Oliver Breitwieser 2017-09-18 09:26:08 -04:00 committed by scheibelp
parent 20cd82dc56
commit 9024ddcf05
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/spack/llnl/util/link_tree.py
View File

@ -66,8 +66,14 @@ def find_conflict(self, dest_root, **kwargs):
def merge(self, dest_root, **kwargs): def merge(self, dest_root, **kwargs):
"""Link all files in src into dest, creating directories """Link all files in src into dest, creating directories
if necessary.""" if necessary.
If ignore_conflicts is True, do not break when the target exists but
rather return a list of files that could not be linked.
Note that files blocking directories will still cause an error.
"""
kwargs['order'] = 'pre' kwargs['order'] = 'pre'
ignore_conflicts = kwargs.get("ignore_conflicts", False)
existing = []
for src, dest in traverse_tree(self._root, dest_root, **kwargs): for src, dest in traverse_tree(self._root, dest_root, **kwargs):
if os.path.isdir(src): if os.path.isdir(src):
if not os.path.exists(dest): if not os.path.exists(dest):
@ -83,8 +89,15 @@ def merge(self, dest_root, **kwargs):
touch(marker) touch(marker)
else: else:
assert(not os.path.exists(dest)) if os.path.exists(dest):
os.symlink(src, dest) if ignore_conflicts:
existing.append(src)
else:
raise AssertionError("File already exists: %s" % dest)
else:
os.symlink(src, dest)
if ignore_conflicts:
return existing
def unmerge(self, dest_root, **kwargs): def unmerge(self, dest_root, **kwargs):
"""Unlink all files in dest that exist in src. """Unlink all files in dest that exist in src.