summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2011-02-21 20:52:58 (GMT)
committerNed Deily <nad@acm.org>2011-02-21 20:52:58 (GMT)
commita16b05b317d1f6d6fd80f1dd4e7c0800d4d4cffa (patch)
tree4b1f619f5b5797a6f699cd2cfc39f8400df07309
parent540b636077d4866b3d9739b10491af970710e8ef (diff)
downloadcpython-a16b05b317d1f6d6fd80f1dd4e7c0800d4d4cffa.zip
cpython-a16b05b317d1f6d6fd80f1dd4e7c0800d4d4cffa.tar.gz
cpython-a16b05b317d1f6d6fd80f1dd4e7c0800d4d4cffa.tar.bz2
Merged revisions 88475 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88475 | ned.deily | 2011-02-21 12:44:27 -0800 (Mon, 21 Feb 2011) | 3 lines 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/NEWS6
2 files changed, 7 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 9890cb5..4d139e8 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -21,6 +21,12 @@ 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.
+
What's New in Python 3.2?
=========================