From 0ee3a3c401f248e50fa4ca4ac46acc63f630d60c Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Mon, 19 Feb 2024 16:33:38 +0100 Subject: [PATCH] Use relative target in symlinks to modified files in view (#42699) --- lib/spack/spack/build_systems/python.py | 2 +- var/spack/repos/builtin/packages/python/package.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/build_systems/python.py b/lib/spack/spack/build_systems/python.py index e3df3ab3747..f554bfef536 100644 --- a/lib/spack/spack/build_systems/python.py +++ b/lib/spack/spack/build_systems/python.py @@ -180,7 +180,7 @@ def add_files_to_view(self, view, merge_map, skip_if_exists=True): except (OSError, KeyError): target = None if target: - os.symlink(target, dst) + os.symlink(os.path.relpath(target, os.path.dirname(dst)), dst) else: view.link(src, dst, spec=self.spec) diff --git a/var/spack/repos/builtin/packages/python/package.py b/var/spack/repos/builtin/packages/python/package.py index 8ca289b1968..b828db93718 100644 --- a/var/spack/repos/builtin/packages/python/package.py +++ b/var/spack/repos/builtin/packages/python/package.py @@ -1306,7 +1306,7 @@ def add_files_to_view(self, view, merge_map, skip_if_exists=True): except (OSError, KeyError): target = None if target: - os.symlink(target, dst) + os.symlink(os.path.relpath(target, os.path.dirname(dst)), dst) else: view.link(src, dst, spec=self.spec)