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 40c564435a39348f00269e74ec6d9c863d8e7d07..bd086c877c1a5d8abcb509d0d4ec1c57be2d0bba 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -173,6 +173,9 @@ Extension Modules
 Build
 -----
 
+- Issue #11268: Prevent Mac OS X Installer failure if Documentation
+  package had previously been installed.
+
 - Issue #11079: The /Applications/Python x.x folder created by the Mac
   OS X installers now includes a link to the installed documentation.