summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-02-21 20:44:27 (GMT)
committerNed Deily <nad@acm.org>2011-02-21 20:44:27 (GMT)
commit5eaee2e23b374f83628d20acfc542092f1493b14 (patch)
tree27a5c73a41b193281033d1c29d9006dd0341915b
parentd8de5415c8fffcb7472c8696c0f4f662e25ff0b7 (diff)
downloadcpython-5eaee2e23b374f83628d20acfc542092f1493b14.zip
cpython-5eaee2e23b374f83628d20acfc542092f1493b14.tar.gz
cpython-5eaee2e23b374f83628d20acfc542092f1493b14.tar.bz2
Issue #11268: Prevent Mac OS X Installer failure if Documentation
package had previously been installed.
-rwxr-xr-xMac/BuildScript/scripts/postflight.documentation2
-rw-r--r--Misc/NEWS7
2 files changed, 8 insertions, 1 deletions
diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation
index 30d2ee5..31fbf2f 100755
--- a/Mac/BuildScript/scripts/postflight.documentation
+++ b/Mac/BuildScript/scripts/postflight.documentation
@@ -27,6 +27,6 @@ fi
if [ -d "${SHARE_DIR}" ]; then
mkdir -p "${SHARE_DOCDIR}"
# make relative link to html doc directory
- ln -s "${SHARE_DOCDIR_TO_FWK}/${FWK_DOCDIR_SUBPATH}" "${SHARE_DOCDIR}/html"
+ ln -fhs "${SHARE_DOCDIR_TO_FWK}/${FWK_DOCDIR_SUBPATH}" "${SHARE_DOCDIR}/html"
fi
diff --git a/Misc/NEWS b/Misc/NEWS
index 65ae5f9..d01a0e1 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,7 +21,14 @@ Library
- Issue #10276: Fix the results of zlib.crc32() and zlib.adler32() on buffers
larger than 4GB. Patch by Nadeem Vawda.
+Build
+-----
+
+- Issue #11268: Prevent Mac OS X Installer failure if Documentation
+ package had previously been installed.
+
Tests
+-----
- Issue #10990: Prevent tests from clobbering a set trace function.