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.

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

Don't patch twice the same file #4529

Merged
merged 2 commits into from
Feb 16, 2021
Merged

Don't patch twice the same file #4529

merged 2 commits into from
Feb 16, 2021

Conversation

rjbou
Copy link
Collaborator

@rjbou rjbou commented Feb 5, 2021

Patch was launched twice on the same file, and the same piece of code lead to an error with dev profile errors enabled :

File "src/client/opamAction.ml", line 305, characters 6-34:
305 |       OpamFilename.patch patch dir)
            ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Error: This expression has type exn option job
       but an expression was expected of type unit

@rjbou rjbou added the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Feb 11, 2021
@rjbou rjbou added this to the 2.1.0~beta5 milestone Feb 11, 2021
@rjbou rjbou force-pushed the nopatchpatch branch 2 times, most recently from 9bd584a to f51eb08 Compare February 15, 2021 12:17
@rjbou rjbou removed the PR: QUEUED Pending pull request, waiting for other work to be merged or closed label Feb 15, 2021
@rjbou rjbou merged commit 6d64f39 into ocaml:master Feb 16, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant