From 94c0740a8850c7007ed1342979392c53878fe8cf Mon Sep 17 00:00:00 2001 From: Oliver Breitwieser Date: Fri, 15 Sep 2017 08:55:12 -0400 Subject: [PATCH] link_tree: only remove matching files when unmerging --- lib/spack/llnl/util/link_tree.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/spack/llnl/util/link_tree.py b/lib/spack/llnl/util/link_tree.py index 49ee03c1ca0..34a119f5702 100644 --- a/lib/spack/llnl/util/link_tree.py +++ b/lib/spack/llnl/util/link_tree.py @@ -26,6 +26,7 @@ import os import shutil +import filecmp from llnl.util.filesystem import traverse_tree, mkdirp, touch @@ -113,4 +114,8 @@ def unmerge(self, dest_root, **kwargs): elif os.path.exists(dest): if not os.path.islink(dest): raise ValueError("%s is not a link tree!" % dest) - os.remove(dest) + # remove if dest is a hardlink/symlink to src; this will only + # be false if two packages are merged into a prefix and have a + # conflicting file + if filecmp.cmp(src, dest, shallow=True): + os.remove(dest)