[Python-checkins] r88479 - in python/branches/release27-maint: Mac/BuildScript/scripts/postflight.documentation Misc/NEWS

[ned.deily]

Author: ned.deily
Date: Mon Feb 21 22:00:09 2011
New Revision: 88479

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


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Mac/BuildScript/scripts/postflight.documentation
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Mac/BuildScript/scripts/postflight.documentation
==============================================================================
--- python/branches/release27-maint/Mac/BuildScript/scripts/postflight.documentation	(original)
+++ python/branches/release27-maint/Mac/BuildScript/scripts/postflight.documentation	Mon Feb 21 22:00:09 2011
@@ -27,6 +27,6 @@
 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
 

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Mon Feb 21 22:00:09 2011
@@ -173,6 +173,9 @@
 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.