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

bpo-26791: update shutil.move() to provide the same symlink move behavior as the mv shell when moving a symlink into a directory that is the target of the symlink #21759

Merged
merged 4 commits into from
Dec 27, 2023

Conversation

websurfer5
Copy link
Contributor

@websurfer5 websurfer5 commented Aug 6, 2020

shutil.move() calls _samefile() to check whether a destination directory and a source path resolve to the same path. If they do, it assumes (per comment) that it is because of a case-insensitive filesystem and calls os.rename() to perform the move. When the source is a symlink that resolves to the destination directory, os.rename() raises an exception that is returned to the shutil.move() caller. By contrast, the mv shell command moves the symlink into the directory.

A solution to get the mv behavior is to check whether the source is a symlink when _samefile() returns True in order to bypass the os.rename() call and trigger the normal symlink handling in shutil.move().

https://bugs.python.org/issue26791

…ll mv command when moving a symlink into a direcotry that is the target of a symlink
@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) December 27, 2023 16:09
@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) December 27, 2023 16:09
@serhiy-storchaka serhiy-storchaka added needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes labels Dec 27, 2023
@serhiy-storchaka serhiy-storchaka merged commit c66b577 into python:main Dec 27, 2023
33 checks passed
@miss-islington-app
Copy link

Thanks @websurfer5 for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

@bedevere-app
Copy link

bedevere-app bot commented Dec 27, 2023

GH-113517 is a backport of this pull request to the 3.12 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 27, 2023
…vior as the mv shell when moving a symlink into a directory that is the target of the symlink (pythonGH-21759)

(cherry picked from commit c66b577)

Co-authored-by: Jeffrey Kintscher <49998481+websurfer5@users.noreply.github.com>
@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Dec 27, 2023
@bedevere-app
Copy link

bedevere-app bot commented Dec 27, 2023

GH-113518 is a backport of this pull request to the 3.11 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 27, 2023
…vior as the mv shell when moving a symlink into a directory that is the target of the symlink (pythonGH-21759)

(cherry picked from commit c66b577)

Co-authored-by: Jeffrey Kintscher <49998481+websurfer5@users.noreply.github.com>
@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Dec 27, 2023
serhiy-storchaka pushed a commit that referenced this pull request Dec 27, 2023
…ve behavior as the mv shell when moving a symlink into a directory that is the target of the symlink (GH-21759) (GH-113517)

(cherry picked from commit c66b577)

Co-authored-by: Jeffrey Kintscher <49998481+websurfer5@users.noreply.github.com>
serhiy-storchaka pushed a commit that referenced this pull request Dec 27, 2023
…ve behavior as the mv shell when moving a symlink into a directory that is the target of the symlink (GH-21759) (GH-113518)

(cherry picked from commit c66b577)

Co-authored-by: Jeffrey Kintscher <49998481+websurfer5@users.noreply.github.com>
kulikjak pushed a commit to kulikjak/cpython that referenced this pull request Jan 22, 2024
…vior as the mv shell when moving a symlink into a directory that is the target of the symlink (pythonGH-21759)
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
…vior as the mv shell when moving a symlink into a directory that is the target of the symlink (pythonGH-21759)
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
…vior as the mv shell when moving a symlink into a directory that is the target of the symlink (pythonGH-21759)
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.

5 participants