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.
........

diff --git a/Mac/BuildScript/scripts/postflight.documentation b/Mac/BuildScript/scripts/postflight.documentation
index 30d2ee527ba045c1b638ffc1793314e96887a359..31fbf2feffd75b779152ab41c64c63fedb0da01b 100755 (executable)
--- 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 9890cb5539764e7b32d0d79affc5156f5f08d762..4d139e8f5ae8cf008259cc66e502aa1e61de6459 100644 (file)
--- 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?
 =========================