summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-12-09 02:03:03 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-12-09 02:03:03 (GMT)
commitd729aada6a52c86fe6ec9150cb6ef3f7efedf0a5 (patch)
tree1049c0b0c54f14bd698eaab40680094b8be68e3e
parent2d873bd68b400e056e77790ca72cc7a7d8a5d07c (diff)
downloadcpython-d729aada6a52c86fe6ec9150cb6ef3f7efedf0a5.zip
cpython-d729aada6a52c86fe6ec9150cb6ef3f7efedf0a5.tar.gz
cpython-d729aada6a52c86fe6ec9150cb6ef3f7efedf0a5.tar.bz2
specify how things are copied
-rw-r--r--Doc/library/shutil.rst2
-rwxr-xr-xMac/BuildScript/build-installer.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
index b409bb7..7baff30 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 2408960..4000a77 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,)