opam list: fix another small blind spot

ocaml · Feb 2, 2022 · 2b35623 · 2b35623
1 parent 9ebdca4
commit 2b35623
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 4 deletions.
diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml
@@ -555,7 +555,7 @@ let coinstallable_subset universe ?(add_invariant=true) set packages =
     (slog OpamPackage.Set.to_string) packages;
   let cudf_packages_map =
     load_cudf_packages ~add_invariant ~build:true ~post:true universe
-      (universe.u_available ++ packages) ()
+      (universe.u_available ++ set ++ packages) ()
   in
   let cudf_set, cudf_packages_map =
     OpamPackage.Set.fold (fun nv (set, map) ->

diff --git a/tests/reftests/list.test b/tests/reftests/list.test
@@ -230,9 +230,47 @@ rankers.1.0.0
 rankers.2.0.1
 rankers.2.0.7
 ### opam list --depends-on lacaml -s --all-versions --coinstallable-with phylogenetics.x
-Fatal error:
-Not_found
-# Return code 99 #
+gpr.1.2.1
+gpr.1.3.0
+gpr.1.3.1
+gpr.1.4.0
+gpr.1.4.1
+gpr.1.5.0
+libsvm.0.8.3
+libsvm.0.9.0
+libsvm.0.9.1
+libsvm.0.9.2
+libsvm.0.9.3
+libsvm.0.9.4
+libsvm.0.10.0
+oml.0.0.1
+oml.0.0.2
+oml.0.0.3
+oml.0.0.5
+oml.0.0.6
+owl.0.2.0
+owl.0.2.1
+phylogenetics.0.0.0
+pilat.1.1
+pilat.1.2
+pilat.1.3
+slap.0.0.0
+slap.0.1.0
+slap.0.2.0
+slap.0.2.1
+slap.0.2.2
+slap.0.2.3
+slap.1.0.0
+slap.1.0.1
+slap.2.0.0
+slap.2.0.1
+slap.2.0.2
+slap.3.0.0
+slap.3.0.1
+slap.4.0.0
+slap.4.0.1
+slap.4.1.0
+slap.4.1.1
 ### opam list --depends-on lacaml -s --all-versions --installable gpr phylogenetics
 gpr.1.2.1
 gpr.1.3.0