Skip to content

Keep the switch description empty upon switch creation instead of guessing one #7062

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
+1 −19
Draft

Keep the switch description empty upon switch creation instead of guessing one #7062

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
3 changes: 1 addition & 2 deletions src/client/opamCommands.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3099,12 +3099,11 @@ let switch cli =
in
if is_new_switch then
with_repos_rt gt cli repos @@ fun (repos, rt) ->
let synopsis = "Import from " ^ Filename.basename filename in
let (), gt =
OpamGlobalState.with_write_lock gt @@ fun gt ->
let gt, st =
OpamSwitchCommand.create gt ~rt
~synopsis ?repos ~invariant:OpamFormula.Empty
?repos ~invariant:OpamFormula.Empty
~update_config:(not no_switch)
switch
@@ fun st ->
Expand Down
17 changes: 0 additions & 17 deletions src/client/opamSwitchCommand.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,23 +241,6 @@ let install_compiler
OpamConsole.note
"No invariant was set, you may want to use `opam switch set-invariant' \
to keep a stable compiler version on upgrades.";
let t =
if t.switch_config.OpamFile.Switch_config.synopsis = "" then
let synopsis =
if invariant = OpamFormula.Empty then
OpamSwitch.to_string t.switch
else
OpamFormula.to_string invariant
in
let switch_config =
{ t.switch_config with OpamFile.Switch_config.synopsis }
in
if not (OpamStateConfig.(!r.dryrun) || OpamClientConfig.(!r.show)) then
OpamSwitchAction.install_switch_config t.switch_global.root t.switch
switch_config;
{ t with switch_config }
else t
in
let t =
let base_comp =
OpamSwitchState.compute_invariant_packages
Expand Down
Loading