Fix package symlinks towards store

Author: lars-petter-hauge

src/deploy/commands/build.py

@@ -251,12 +251,16 @@ def _build_envs(self) -> None:
 
     def _build_env_for_package(self, base: Path, finalpkg: Package) -> None:
         for pkg in chain([finalpkg], finalpkg.depends):
-            for srcdir, subdirs, files in os.walk(pkg.out):
-                dstdir = base / srcdir[len(str(pkg.out)) + 1 :]
+            out = pkg.out.resolve()
+            for srcdir, subdirs, files in os.walk(out):
+                dstdir = base / srcdir[len(str(out)) + 1 :]
                 dstdir.mkdir(parents=True, exist_ok=True)
                 for f in files:
                     with suppress(FileExistsError):
-                        os.symlink(os.path.join(srcdir, f), os.path.join(dstdir, f))
+                        target = os.path.relpath(
+                            os.path.join(srcdir, f), dstdir.resolve()
+                        )
+                        os.symlink(target, os.path.join(dstdir, f))
 
         # Write a manifest file
         (base / "manifest").write_text(finalpkg.manifest)

tests/test_build.py

@@ -344,20 +344,22 @@ def test_not_overwrite_user_set_version_alias_with_default(tmp_path, base_config
     assert str((tmp_path / "1").readlink()) == "1.1"
 
 
-def test_hello_world_example(tmp_path):
+def test_hello_world_example(tmp_path, monkeypatch):
     import shutil
 
     example_dir = Path(__file__).parent.parent / "examples" / "hello_world"
     work_dir = tmp_path / "hello_world"
     shutil.copytree(example_dir, work_dir, ignore=shutil.ignore_patterns("output"))
 
-    prefix = tmp_path / "prefix"
-    config = load_config(work_dir / "config.yaml")
-    builder = Build(work_dir, config, prefix=prefix)
+    monkeypatch.chdir(work_dir)
+
+    prefix = Path("output/prefix")
+    config = load_config(Path("config.yaml"))
+    builder = Build(Path("."), config, prefix=prefix)
     builder.build()
 
     wrapper = prefix / "bin" / "run"
     assert wrapper.exists()
-    result = subprocess.run([wrapper], capture_output=True, text=True)
+    result = subprocess.run([str(wrapper)], capture_output=True, text=True)
     assert result.returncode == 0
     assert "running with args:" in result.stdout