Skip to content

Commit

Permalink
Merge pull request #6375 from kit-ty-kate/no-ignore-pin-depends-quest…
Browse files Browse the repository at this point in the history
…ion-twice

Do not ask to install pin-depends twice
  • Loading branch information
rjbou authored Feb 5, 2025
2 parents 30d4706 + d077aba commit 0cb525c
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 1 addition & 0 deletions master_changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ users)
* [NEW] Make it so pin list display the current revision of a pinned repository in a new column [#6274 @desumn - fix #5533]
* [BUG] Stop double pin of packages located in ./opam/opam [#6343 @kit-ty-kate - fix #6342]
* Don't ask confirmation when pinning an unknown package (absent from repositories) [#6309 @kit-ty-kate @rjbou - fix #3199]
* [BUG] Do not ask to install pin-depends twice [#6375 @kit-ty-kate - fix #6374]

## List

Expand Down
6 changes: 0 additions & 6 deletions src/client/opamAuxCommands.ml
Original file line number Diff line number Diff line change
Expand Up @@ -494,12 +494,6 @@ let autopin st ?(simulate=false) ?quiet ?locked ?recurse ?subpath
else
OpamUpdate.dev_packages st ~working_dir:OpamPackage.Set.empty already_pinned
in
let st =
if OpamClientConfig.(!r.ignore_pin_depends) then st else
OpamPackage.Set.fold (fun nv st ->
OpamPinCommand.handle_pin_depends st nv (OpamSwitchState.opam st nv))
(OpamPackage.Set.union pins already_pinned_set) st
in
st, atoms

let check_and_revert_sandboxing root config =
Expand Down

0 comments on commit 0cb525c

Please sign in to comment.