Skip to content

Avoid downgrading root packages as much as possible when using the builtin-0install solver #6826

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

Draft
kit-ty-kate wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −12
Draft

Avoid downgrading root packages as much as possible when using the builtin-0install solver #6826

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
52 changes: 40 additions & 12 deletions src/solver/opamBuiltin0install.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,23 +62,51 @@ let restricts (pkgs, constraints) (pkg, c) =
in
(pkgs, constraints)

(* From OpamCudf *)
let s_installed_root = "installed-root"

let create_spec ~drop_installed_packages universe request =
let open (struct
type installed_pkgs =
| Keep of Cudf_types.vpkg
| Installed_priority of Cudf_types.vpkg
| Installed of Cudf_types.vpkg
end) in
let installed_pkgs =
Cudf.fold_packages_by_name (fun acc pkgname pkgs ->
match List.find_opt (fun pkg -> pkg.Cudf.installed) pkgs with
| Some {Cudf.keep = `Keep_version; version; _} -> Keep (pkgname, Some (`Eq, version)) :: acc
| Some {Cudf.keep = `Keep_package; _} -> Keep (pkgname, None) :: acc
| Some {Cudf.keep = `Keep_feature; _} -> assert false (* NOTE: Opam has no support for features *)
| Some {Cudf.keep = `Keep_none; pkg_extra; _} ->
if keep_installed ~drop_installed_packages request pkgname then
if List.mem (s_installed_root, `Bool true) pkg_extra then
Installed_priority (pkgname, None) :: acc
else
Installed (pkgname, None) :: acc
else
acc
| None -> acc
) [] universe
in
let spec = ([], []) in
let spec =
List.fold_left (fun spec -> function
| Keep _ | Installed_priority _ -> spec
| Installed vpkg -> recommended spec vpkg
) spec installed_pkgs
in
let spec =
List.fold_left (fun spec -> function
| Installed _ -> spec
| Keep vpkg -> essential spec vpkg
| Installed_priority vpkg -> recommended spec vpkg
) spec installed_pkgs
in
let spec = List.fold_left essential spec request.Cudf.install in
let spec = List.fold_left essential spec request.Cudf.upgrade in
let spec = List.fold_left restricts spec request.Cudf.remove in
Cudf.fold_packages_by_name (fun spec pkgname pkgs ->
match List.find_opt (fun pkg -> pkg.Cudf.installed) pkgs with
| Some {Cudf.keep = `Keep_version; version; _} -> essential spec (pkgname, Some (`Eq, version))
| Some {Cudf.keep = `Keep_package; _} -> essential spec (pkgname, None)
| Some {Cudf.keep = `Keep_feature; _} -> assert false (* NOTE: Opam has no support for features *)
| Some {Cudf.keep = `Keep_none; _} ->
if keep_installed ~drop_installed_packages request pkgname then
recommended spec (pkgname, None)
else
spec
| None -> spec
) spec universe
spec

let reconstruct_universe universe selections =
Opam_0install_cudf.packages_of_result selections |>
Expand Down
Loading