fix: os.rename -> shutil.move #534
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
westonsteimel
changed the title
westonsteimel
force-pushed
the
shutil-move
branch
from
01bef09
to
df3a31b
Compare
westonsteimel
changed the title
westonsteimel
added
the
run-pr-quality-gate
Replace instances of `os.rename` with `shutil.move` to handle the possibility of the destination being a different filesystem. If the source and destination are on the same filesystem, `os.rename` is used per https://docs.python.org/3.11/library/shutil.html#shutil.move Signed-off-by: Weston Steimel <commits@weston.slmail.me>
westonsteimel
force-pushed
the
shutil-move
branch
from
df3a31b
to
8683e67
Compare
westonsteimel
changed the title
As opposed to rename, when moving a dir to a dir, shutil.move will try to nest src under dst. Signed-off-by: Will Murphy <will.murphy@anchore.com>
src/vunnel/workspace.py
Outdated
| @@ -243,17 +244,17 @@ def overlay_existing(self, source: str, move: bool = False) -> None: | |||
| os.makedirs(os.path.dirname(dst), exist_ok=True) | |||
|
|
|||
| if move: | |||
| os.rename(src, dst) | |||
| shutil.move(src, dst) | |||
There was a problem hiding this comment.
Actually, we might need the same change here, and it's just not failing a test.
There was a problem hiding this comment.
Is overlay_existing actually used anywhere? I can't find any invocations of it. Maybe we can just remove it?
There was a problem hiding this comment.
I don't see it used anywhere. I think it was added by mistake in #520, since that PR went through a lot of iterations.
I've pushed a commit removing the function.
Signed-off-by: Will Murphy <will.murphy@anchore.com>
spiffcs
approved these changes
Apr 3, 2024
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.
Replace instances of
os.renamewithshutil.moveto handle the possibility of the destination being a different filesystem. If the source and destination are on the same filesystem,os.renameis used per https://docs.python.org/3.11/library/shutil.html#shutil.move