fix Assertion failed: pkgx: env is being duped when multiple unicod…

…es in env closes #988
pkgxdev · Mar 14, 2024 · 1c893af · 1c893af
1 parent 104affb
commit 1c893af
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/prefab/construct-env.test.ts b/src/prefab/construct-env.test.ts
@@ -48,4 +48,15 @@ async fn(runner) {
       await _internals.runtime_env(pkg, [])
     }
   })
+
+  await runner.step("multiple versions", async () => {
+    const tmp = Path.mktemp()
+
+    const installations = [
+      { pkg: {project: "unicode.org", version: new SemVer("71.0.0")}, path: tmp.join("unicode.org/v71.0.0").mkdir('p') },
+      { pkg: {project: "unicode.org", version: new SemVer("73.0.0")}, path: tmp.join("unicode.org/v73.0.0").mkdir('p') },
+    ]
+
+    await _internals.mkenv({ installations })
+  })
 }})
diff --git a/src/prefab/construct-env.ts b/src/prefab/construct-env.ts
@@ -36,7 +36,7 @@ export default async function(pkgenv: { installations: Installation[] }) {
 
 ///////////////////////// reworked from useShellEnv needs porting back to libpkgx
 async function mkenv({installations}: {installations: Installation[]}) {
-  const projects = new Set(installations.map(x => x.pkg.project))
+  const projects = new Set(installations.map(x => `${x.pkg.project}@${x.pkg.version}`))
   console.assert(projects.size == installations.length, "pkgx: env is being duped")
 
   const common_vars: Record<string, OrderedSet<string>> = {}
@@ -160,5 +160,6 @@ class OrderedSet<T> {
 
 ////////////////////////////////////////////////////////////////////// internals
 export const _internals = {
-  runtime_env: (pkg: Package, installations: Installation[]) => usePantry().project(pkg.project).runtime.env(pkg.version, installations)
+  runtime_env: (pkg: Package, installations: Installation[]) => usePantry().project(pkg.project).runtime.env(pkg.version, installations),
+  mkenv
 }