Skip to content

Avoid trying to be too clever when upgrading switches from opam 2.0 #5002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Avoid trying to be too clever when upgrading switches from opam 2.0 #5002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fd1560
Avoid trying to be too clever when upgrading switches from opam 2.0
kit-ty-kate Jan 18, 2022
01511e7
Update master_changes.md
kit-ty-kate Jan 18, 2022
d935750
Update the testsuite
kit-ty-kate Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions master_changes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ users)
* [BUG] Fix `set-invariant: default repos were loaded instead of switch repos [#4866 @rjbou]
* Add support for `opam switch -` (go to previous non-local switch) [#4910 @kit-ty-kate - fix 4866]
* On loading, check for executable external files if they are in `PATH`, and warn if not the case [#4932 @rjbou - fix #4923]
* Avoid trying to be too clever when upgrading switches from opam 2.0 [#5002 @kit-ty-kate - fix #4501]

## Pin
* Switch the default version when undefined from ~dev to dev [#4949 @kit-ty-kate]
Expand Down
12 changes: 1 addition & 11 deletions src/state/opamSwitchState.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,17 +131,7 @@ let infer_switch_invariant_raw
compiler []
in
match List.sort (fun (_, c1) (_, c2) -> compare c1 c2) counts with
| (nv, _) :: _ ->
let versions =
OpamPackage.packages_of_name (Lazy.force available_packages) nv.name
in
let n = OpamPackage.Set.cardinal versions in
if n <= 1 then
OpamFormula.Atom (nv.name, Empty)
else if nv = OpamPackage.Set.max_elt versions then
OpamFormula.Atom (nv.name, Atom (`Geq, nv.version))
else
OpamFormula.Atom (nv.name, Atom (`Eq, nv.version))
| (nv, _) :: _ -> OpamFormula.Atom (nv.name, Atom (`Eq, nv.version))
| [] -> OpamFormula.Empty

let infer_switch_invariant st =
Expand Down
24 changes: 12 additions & 12 deletions tests/reftests/opamroot-versions.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ FMT_UPG Format upgrade done
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ sw-sys-comp
STATE Inferred invariant: from base packages { i-am-sys-compiler.1 }, (roots { i-am-sys-compiler.1 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.1 }, (roots { i-am-sys-compiler.1 }) => ["i-am-sys-compiler" {= "1"}]
STATE Switch state loaded in 0.000s
# Packages matching: installed
# Name # Installed # Synopsis
Expand All @@ -679,7 +679,7 @@ RSTATE Cache found
STATE LOAD-SWITCH-STATE @ sw-comp
STATE Definition missing for installed package i-am-compiler.2, copying from repo
STATE Definition missing for installed package i-am-package.2, copying from repo
STATE Inferred invariant: from base packages { i-am-compiler.2 }, (roots { i-am-compiler.2 }) => ["i-am-compiler" {>= "2"}]
STATE Inferred invariant: from base packages { i-am-compiler.2 }, (roots { i-am-compiler.2 }) => ["i-am-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
STATE Detected changed packages (marked for reinstall): {}
The following actions will be performed:
Expand Down Expand Up @@ -716,7 +716,7 @@ opam-version: "2.0"
repositories: "default"
switch: "sw-comp"
### opam-cat $OPAMROOT/sw-comp/.opam-switch/switch-config
invariant: ["i-am-compiler" {>= "2"}]
invariant: ["i-am-compiler" {= "2"}]
opam-version: "2.0"
synopsis: "switch with compiler"
paths {
Expand All @@ -740,7 +740,7 @@ FMT_UPG Format upgrade done
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
# Packages matching: installed
# Name # Installed # Synopsis
Expand All @@ -755,7 +755,7 @@ RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Definition missing for installed package i-am-sys-compiler.2, copying from repo
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
STATE Detected changed packages (marked for reinstall): {}
The following actions will be performed:
Expand Down Expand Up @@ -789,7 +789,7 @@ opam-version: "2.0"
repositories: "default"
switch: "sw-sys-comp"
### opam-cat _opam/.opam-switch/switch-config
invariant: ["i-am-sys-compiler"]
invariant: ["i-am-sys-compiler" {= "2"}]
opam-root: "${BASEDIR}/OPAM"
opam-version: "2.0"
synopsis: "local switch"
Expand All @@ -815,7 +815,7 @@ FMT_UPG Format upgrade done
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
# Packages matching: installed
# Name # Installed # Synopsis
Expand All @@ -829,7 +829,7 @@ RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Definition missing for installed package i-am-sys-compiler.2, copying from repo
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
STATE Detected changed packages (marked for reinstall): {}
The following actions will be performed:
Expand Down Expand Up @@ -863,7 +863,7 @@ opam-version: "2.0"
repositories: "default"
switch: "sw-sys-comp"
### opam-cat _opam/.opam-switch/switch-config
invariant: ["i-am-sys-compiler"]
invariant: ["i-am-sys-compiler" {= "2"}]
opam-root: "${BASEDIR}/OPAM"
opam-version: "2.0"
synopsis: "local switch"
Expand All @@ -886,7 +886,7 @@ GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
# Packages matching: installed
# Name # Installed # Synopsis
Expand All @@ -897,7 +897,7 @@ GSTATE LOAD-GLOBAL-STATE @ ${BASEDIR}/OPAM
RSTATE LOAD-REPOSITORY-STATE @ ${BASEDIR}/OPAM
RSTATE Cache found
STATE LOAD-SWITCH-STATE @ ${BASEDIR}
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler"]
STATE Inferred invariant: from base packages { i-am-sys-compiler.2 }, (roots { i-am-sys-compiler.2 }) => ["i-am-sys-compiler" {= "2"}]
STATE Switch state loaded in 0.000s
STATE Detected changed packages (marked for reinstall): {}
The following actions will be performed:
Expand Down Expand Up @@ -925,7 +925,7 @@ opam-version: "2.0"
repositories: "default"
switch: "sw-sys-comp"
### opam-cat _opam/.opam-switch/switch-config
invariant: ["i-am-sys-compiler"]
invariant: ["i-am-sys-compiler" {= "2"}]
opam-root: "${BASEDIR}/OPAM"
opam-version: "2.0"
synopsis: "local switch"
Expand Down