Merge pull request #51 from flyingcircusio/fix-current-symlink

Fix current symlink feature: link to env_hash instead of env_dir
flyingcircusio · May 7, 2024 · 796a855 · 796a855
2 parents 227a08b + c67fc61
commit 796a855
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/appenv.py b/src/appenv.py
@@ -377,7 +377,7 @@ def prepare(self, args=None, remaining=None):
                 os.unlink(current_path)
             except FileNotFoundError:
                 pass
-            os.symlink(env_dir, current_path)
+            os.symlink(env_hash, current_path)
 
         self.env_dir = env_dir
 

diff --git a/tests/test_prepare.py b/tests/test_prepare.py
@@ -25,4 +25,5 @@ def test_prepare_creates_venv_symlink(workdir, monkeypatch):
     env.update_lockfile()
     env.prepare()
     assert os.path.islink(os.path.join(env.appenv_dir, "current"))
-    assert os.readlink(os.path.join(env.appenv_dir, "current")) == env.env_dir
+    assert (os.path.realpath(os.path.join(
+        env.appenv_dir, "current")) == os.path.realpath(env.env_dir))