merge conflict - I like my way better

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
vsoch · Nov 16, 2021 · 9345918 · 9345918
2 parents c55ba3e + 7675395
commit 9345918
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/lib/spack/spack/rewiring.py b/lib/spack/spack/rewiring.py
@@ -25,8 +25,7 @@ def _relocate_spliced_links(links, orig_prefix, new_prefix):
     because it expects the new directory structure to be in place."""
     for link in links:
         link_target = os.readlink(os.path.join(orig_prefix, link))
-        print(link_target)
-        link_target = re.sub('^' + orig_prefix, '^' + new_prefix, link_target)
+        link_target = re.sub('^' + orig_prefix, new_prefix, link_target)
         new_link_path = os.path.join(new_prefix, link)
         os.unlink(new_link_path)
         os.symlink(link_target, new_link_path)