Skip to content

Stop double pin of packages located in ./opam/opam#6343

Merged
kit-ty-kate merged 3 commits intoocaml:masterfrom
kit-ty-kate:no-double-pin
Jan 16, 2025
Merged

Stop double pin of packages located in ./opam/opam#6343
kit-ty-kate merged 3 commits intoocaml:masterfrom
kit-ty-kate:no-double-pin

Conversation

@kit-ty-kate
Copy link
Copy Markdown
Member

Fixes #6342

The problem was that the files_in_source function would call its internal scanning function files twice on <dir> and <dir>/opam, however a side close of that subfunction would itself add <dir>/opam/opam if it is detected, which leads to the same file being detected twice.

Copy link
Copy Markdown
Collaborator

@rjbou rjbou left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've added a test in pin test (lock test is a side effect, it's not its purpose).
Otherwise, lgtm!

@kit-ty-kate kit-ty-kate merged commit 436b4fe into ocaml:master Jan 16, 2025
@kit-ty-kate kit-ty-kate deleted the no-double-pin branch January 16, 2025 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Double pin of package when in opam directory

2 participants