mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-12 13:55:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

Issue #9993: When the source and destination are on different filesystems,

Browse source 
and the source is a symlink, shutil.move() now recreates a symlink on the
destination instead of copying the file contents.
Patch by Jonathan Niehof and Hynek Schlawack.
This commit is contained in:
Antoine Pitrou 2012-01-06 20:16:19 +01:00
parent deec7566ae
commit 0a08d7a095
5 changed files with 64 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/shutil.py
View file

@ -356,7 +356,10 @@ def move(src, dst):
overwritten depending on os.rename() semantics.
If the destination is on our current filesystem, then rename() is used.
Otherwise, src is copied to the destination and then removed.
Otherwise, src is copied to the destination and then removed. Symlinks are
recreated under the new name if os.rename() fails because of cross
filesystem renames.
A lot more could be done here... A look at a mv.c shows a lot of
the issues this implementation glosses over.
@ -375,7 +378,11 @@ def move(src, dst):
try:
os.rename(src, real_dst)
except OSError:
if os.path.isdir(src):
if os.path.islink(src):
linkto = os.readlink(src)
os.symlink(linkto, real_dst)
os.unlink(src)
elif os.path.isdir(src):
if _destinsrc(src, dst):
raise Error("Cannot move a directory '%s' into itself '%s'." % (src, dst))
copytree(src, real_dst, symlinks=True)