From: Greg Ward <gward@python.net>
Date: Sat, 20 May 2000 16:05:34 +0000 (+0000)
Subject: Tweaked output of 'copy_file()': if copying to a new name, show the whole
X-Git-Tag: v2.0b1~1708
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4355093f94299572498d31fa50eec38df721cadb;p=thirdparty%2FPython%2Fcpython.git

Tweaked output of 'copy_file()': if copying to a new name, show the whole
destination path, otherwise show just the directory.
---

diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py
index 32245109d533..a73db42b54d0 100644
--- a/Lib/distutils/file_util.py
+++ b/Lib/distutils/file_util.py
@@ -90,7 +90,7 @@ def copy_file (src, dst,
        (os.symlink) instead of copying: set it to "hard" or "sym"; if it
        is None (the default), files are copied.  Don't set 'link' on
        systems that don't support it: 'copy_file()' doesn't check if
-       hard or symbolic linking is availalble.
+       hard or symbolic linking is available.
 
        Under Mac OS, uses the native file copy function in macostools;
        on other systems, uses '_copy_file_contents()' to copy file
@@ -131,8 +131,11 @@ def copy_file (src, dst,
         raise ValueError, \
               "invalid value '%s' for 'link' argument" % link
     if verbose:
-        print "%s %s -> %s" % (action, src, dir)
-
+        if os.path.basename(dst) == os.path.basename(src):
+            print "%s %s -> %s" % (action, src, dir)
+        else:
+            print "%s %s -> %s" % (action, src, dst)
+            
     if dry_run:
         return 1