Fix a regression on 'opam upgrade --all <uninstalled-pkg>' not upgrading the whole switch

Author: kit-ty-kate

master_changes.md

@@ -57,6 +57,7 @@ users)
 
 ## Update / Upgrade
   * [BUG] Fix a regression on `opam upgrade <package>` upgrading unrelated packages [#6373 @AltGr]
+  * [BUG] Fix a regression on `opam upgrade --all <uninstalled-pkg>` not upgrading the whole switch [#6373 @kit-ty-kate]
 
 ## Tree
 

src/client/opamClient.ml

@@ -122,7 +122,7 @@ let compute_upgrade_t
        ~upgrade:to_upgrade
        ~deprequest:(OpamFormula.to_atom_formula formula)
        ?all:(if all then Some [] else None)
-       ~criteria:(if to_install = [] && all then `Upgrade else `Default)
+       ~criteria:(if all then `Upgrade else `Default)
        ())
 
 let print_requested requested formula =

tests/reftests/upgrade.test

@@ -437,6 +437,10 @@ The following actions would be performed:
 ### opam upgrade --show -a uninstalled
 uninstalled is not installed. Install it? [Y/n] y
 The following actions would be performed:
+=== upgrade 3 packages
+  - upgrade bar         2 to 3
+  - upgrade baz         1 to 2 [uses foo]
+  - upgrade foo         3 to 4
 === install 1 package
   - install uninstalled 1
 ### opam upgrade --show