Restore oldcwd if process creation fails #5441
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kit-ty-kate
reviewed
Feb 10, 2023
src/core/opamProcess.ml
Outdated
Comment on lines
453
to
454
| begin try Unix.chdir oldcwd | ||
| with Unix.Unix_error _ -> () end; |
There was a problem hiding this comment.
Looks obviously correct but couldn’t we merge both uses of Unix.chdir using Fun.protect starting below the first Unix.chdir at the top of the function? This way if another reraise or uncaught exception occures it will be handled automatically
There was a problem hiding this comment.
Yeah, I should have avoided being lazy (the laziness is having to add Fun.protect to OpamCompat )
kit-ty-kate
force-pushed
the
process-error-cwd
branch
from
0419849
to
ad541e5
Compare
kit-ty-kate
approved these changes
Feb 14, 2023
rjbou
reviewed
Feb 15, 2023
| @@ -618,3 +619,4 @@ users) | |||
| * `OpamStd.Option`: add `equal` function [#5374 @rjbou] | |||
| * `OpamStd.Compare`: add module to flag polymorphic comparison functions in opam codebase [#5374 @kit-ty-kate @rjbou] | |||
| * `OpamStd.Env.`: introduce OpamStd.Env.Name to abstract environment variable names [#5356 @dra27] | |||
| * `OpamCompat`: Add `Fun.protect` [#5441 @kit-ty-kate] | |||
There was a problem hiding this comment.
Hum we already had OpamStd.Fun.finally which is the same function (way before there was a Fun module in the stdlib :/)
It'd be best to ensure we consistently use the same function everywhere.
rjbou
approved these changes
Feb 15, 2023
rjbou
moved this from PR to review for 2.2.0~alpha
to PR finalised (merge with CI)
in Opam 2.2.0
|
thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Spotted when package commands fail during switch creation - the cwd is left in the build directory for the package which on Windows then prevents the switch from being cleaned up.