Skip to content

Commit 8cf4540

Browse files
AltGrkit-ty-kate
authored andcommitted
Fix regression on 'opam upgrade <package>' upgrading unrelated things
Regression introduced in 4db0c13, which is dedicated to a different case (functionality of this patch is preserved)
1 parent 167b8b7 commit 8cf4540

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

src/client/opamClient.ml

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ let compute_upgrade_t
113113
| Some nv -> not (OpamPackage.Set.mem nv (Lazy.force t.available_packages)))
114114
atoms
115115
in
116-
let criteria = if to_install = [] then `Upgrade else `Default in
116+
let criteria = if to_install = [] && all then `Upgrade else `Default in
117117
if all then
118118
names,
119119
OpamSolution.resolve t Upgrade

tests/reftests/upgrade.test

+12-5
Original file line numberDiff line numberDiff line change
@@ -402,16 +402,23 @@ depends: "foo"
402402
opam-version: "2.0"
403403
### opam upgrade baz
404404
The following actions will be performed:
405-
=== upgrade 2 packages
405+
=== upgrade 1 package
406406
- upgrade baz 1 to 2
407-
- upgrade foo 3 to 4 [required by baz]
408407

409408
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
410409
-> removed baz.1
410+
-> installed baz.2
411+
Done.
412+
### opam upgrade
413+
The following actions will be performed:
414+
=== recompile 1 package
415+
- recompile baz 2 [uses foo]
416+
=== upgrade 1 package
417+
- upgrade foo 3 to 4
418+
419+
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
420+
-> removed baz.2
411421
-> removed foo.3
412422
-> installed foo.4
413423
-> installed baz.2
414424
Done.
415-
### opam upgrade
416-
Already up-to-date.
417-
Nothing to do.

0 commit comments

Comments
 (0)