From: Benjamin Peterson <benjamin@python.org>
Date: Tue, 9 Dec 2008 02:03:03 +0000 (+0000)
Subject: specify how things are copied
X-Git-Tag: v2.7a1~2558
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d729aada6a52c86fe6ec9150cb6ef3f7efedf0a5;p=thirdparty%2FPython%2Fcpython.git

specify how things are copied
---

diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index b409bb739345..7baff30a4cc0 100644
--- a/Doc/library/shutil.rst
+++ b/Doc/library/shutil.rst
@@ -156,7 +156,7 @@ copying and removal. For operations on individual files, see also the
    Recursively move a file or directory to another location.
 
    If the destination is on the current filesystem, then simply use rename.
-   Otherwise, copy src to the dst and then remove src.
+   Otherwise, copy src (with :func:`copy2`) to the dst and then remove src.
 
    .. versionadded:: 2.3
 
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2408960d9499..4000a77ce098 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -587,7 +587,7 @@ def buildPythonDocs():
 
     novername = 'python-docs-html.tar.bz2'
     name = 'html-%s.tar.bz2'%(getFullVersion(),)
-    sourceArchive = os.path.join(DEPSRC, name)
+    sourceArchive = os.path.join(DEPSRC, novername)
     if os.path.exists(sourceArchive):
         print "Using local copy of %s"%(name,)