Merge pull request #1779 from OCamlPro/fix-internal-downgrade

Fixed bug with internal solver mass-downgrading on some requests
ocaml · Oct 8, 2014 · d6e48d0 · d6e48d0
2 parents 89f8499 + 294d771
commit d6e48d0
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/src/client/opamClient.ml b/src/client/opamClient.ml
@@ -661,7 +661,11 @@ module API = struct
         (OpamSolution.atoms_of_packages
            (t.installed_roots %% Lazy.force t.available_packages)) in
     let wish_install = List.rev_append add_wish_install wish_install in
+    let uninstalled_eqnames =
+      List.filter (fun (name,_) -> not (OpamState.is_name_installed t name))
+        eqnames in
     let wish_upgrade = List.rev_append neqnames wish_upgrade in
+    let wish_upgrade = List.rev_append uninstalled_eqnames wish_upgrade in
     (* Remove orphans *)
     let wish_remove =
       OpamSolution.atoms_of_packages full_orphans @