From f51738b10e83d0adf404ca989970a5b44700d685 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Fri, 6 May 2011 10:23:04 +0200 Subject: Fix for issue 10684: Folders get deleted when trying to change case with shutil.move (case insensitive file systems only) --- Lib/shutil.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Lib/shutil.py') diff --git a/Lib/shutil.py b/Lib/shutil.py index 4862ae6a13..781840dbcd 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -260,12 +260,18 @@ def move(src, dst): """ real_dst = dst if os.path.isdir(dst): + if _samefile(src, dst): + # We might be on a case insensitive filesystem, + # perform the rename anyway. + os.rename(src, dst) + return + real_dst = os.path.join(dst, _basename(src)) if os.path.exists(real_dst): raise Error("Destination path '%s' already exists" % real_dst) try: os.rename(src, real_dst) - except OSError: + except OSError as exc: if os.path.isdir(src): if _destinsrc(src, dst): raise Error("Cannot move a directory '%s' into itself '%s'." % (src, dst)) -- cgit v1.2.1