Skip to content

Commit

Permalink
Use --no-depexts instead of --assume-depexts
Browse files Browse the repository at this point in the history
Means that packages which are unavailable can still be installed, as in
opam 2.0.
  • Loading branch information
dra27 authored and kit-ty-kate committed Dec 3, 2021
1 parent 25c1295 commit c6c516a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ New option/command/subcommand are prefixed with ◈.
*
* Fix typo in error message for opam var [#4786 @kit-ty-kate - fix #4785]
* Add cli 2.2 handling [#4853 @rjbou]
* --assume-depext is the default in CLI 2.0 mode [#4908 @dra27]
* --no-depexts is the default in CLI 2.0 mode [#4908 @dra27]

## Plugins
*
Expand Down
4 changes: 2 additions & 2 deletions src/client/opamArg.ml
Original file line number Diff line number Diff line change
Expand Up @@ -624,7 +624,7 @@ let apply_build_options cli b =
OpamPackage.Name.Set.of_list)
?unlock_base:(flag b.unlock_base)
?locked:(if b.locked then Some (Some b.lock_suffix) else None)
?no_depexts:(flag b.no_depexts)
?no_depexts:(flag b.no_depexts || OpamCLIVersion.Op.(cli @= cli2_0))
();
OpamClientConfig.update
?keep_build_dir:(flag b.keep_build_dir)
Expand All @@ -633,7 +633,7 @@ let apply_build_options cli b =
?show:(flag b.show)
?fake:(flag b.fake)
?skip_dev_update:(flag b.skip_update)
?assume_depexts:(flag (b.assume_depexts || b.no_depexts || OpamCLIVersion.Op.(cli @= cli2_0)))
?assume_depexts:(flag (b.assume_depexts || b.no_depexts))
~scrubbed_environment_variables
()

Expand Down

0 comments on commit c6c516a

Please sign in to comment.