Skip to content
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

Jump to bottom

init: on windows, fix handling of 'git-location' when defined in init config #5848

Merged
merged 1 commit into from
Feb 19, 2024
Merged

init: on windows, fix handling of 'git-location' when defined in init config #5848

Show file tree
Hide file tree
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
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 @@ -22,6 +22,7 @@ users)
* Recommend enabling Developer Mode on Windows [#5831 @dra27]
* Disable ACL in Cygwin internal install to avoid permission mismatch errors [#5796 @kit-ty-kate - fix #5781]
* Add `sys-pkg-manager-cmd` as an accepted field in opamrc files [#5847 @rjbou - fix #5844]
* Fix `git-location` handling in init config file [#5848 @rjbou - fix #5845]

## Config report

Expand Down
48 changes: 34 additions & 14 deletions src/client/opamClient.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,25 @@ let windows_checks ?cygwin_setup ?git_location config =
|> OpamVariable.Map.of_list
in
(* Git handling *)
let git_location : string option = git_for_windows_check ?git_location () in
let git_location =
match git_location, OpamFile.Config.git_location config with
| None, None -> None
| Some (Right ()), None -> Some (Right ())
| Some (Right ()), Some _ ->
OpamConsole.note
"As '--no-git-location' is given in argument, ignoring field \
'git-location' in opamrc";
Some (Right ())
| Some (Left gl), None | None, Some gl -> Some (Left gl)
| Some (Left gl_cli), Some gl_config ->
OpamConsole.note
"Git location defined in opamrc '%s' and via CLI \
('--git-location' option, %s). Keeping last one."
(OpamFilename.Dir.to_string gl_config)
(OpamFilename.Dir.to_string gl_cli) ;
Some (Left gl_cli)
in
let git_location = git_for_windows_check ?git_location () in
OpamCoreConfig.update ?git_location ();
let config =
match git_location with
Expand Down Expand Up @@ -784,18 +802,18 @@ let windows_checks ?cygwin_setup ?git_location config =
OpamStd.Sys.exit_because `Aborted
in
let config =
OpamFile.Config.with_sys_pkg_manager_cmd
(OpamStd.String.Map.add "cygwin" cygcheck
(OpamFile.Config.sys_pkg_manager_cmd config))
config
in
OpamConsole.note "Configured with %s for depexts"
(if OpamSysInteract.Cygwin.is_internal config then
"internal Cygwin install"
else
Printf.sprintf "Cygwin at %s"
OpamFilename.(Dir.to_string (dirname_dir (dirname cygcheck))));
config
OpamFile.Config.with_sys_pkg_manager_cmd
(OpamStd.String.Map.add "cygwin" cygcheck
(OpamFile.Config.sys_pkg_manager_cmd config))
config
in
OpamConsole.note "Configured with %s for depexts"
(if OpamSysInteract.Cygwin.is_internal config then
"internal Cygwin install"
else
Printf.sprintf "Cygwin at %s"
OpamFilename.(Dir.to_string (dirname_dir (dirname cygcheck))));
config
in
let install_cygwin_tools () =
let packages =
Expand Down Expand Up @@ -1018,7 +1036,9 @@ let update_with_init_config ?(overwrite=false) config init_config =
setifnew C.default_invariant C.with_default_invariant
(I.default_invariant init_config) |>
setifnew C.sys_pkg_manager_cmd C.with_sys_pkg_manager_cmd
(I.sys_pkg_manager_cmd init_config)
(I.sys_pkg_manager_cmd init_config) |>
setifnew C.git_location C.with_git_location_opt
(I.git_location init_config)

let reinit ?(init_config=OpamInitDefaults.init_config()) ~interactive
?dot_profile ?update_config ?env_hook ?completion ?inplace
Expand Down
Loading