[Python-checkins] r69545 - in python/branches/release30-maint: Mac/BuildScript/build-installer.py Mac/BuildScript/scripts/postflight.patch-profile

Thu Feb 12 17:09:09 CET 2009

Author: ronald.oussoren
Date: Thu Feb 12 17:09:09 2009
New Revision: 69545
Log:
Merged revisions 69544 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r69544 | ronald.oussoren | 2009年02月12日 17:08:14 +0100 (2009年2月12日) | 2 lines
 
 Fix for issue5224 ("Update Shell Profile.command" contains wrong Python version on OSX)
........
Modified:
 python/branches/release30-maint/ (props changed)
 python/branches/release30-maint/Mac/BuildScript/build-installer.py
 python/branches/release30-maint/Mac/BuildScript/scripts/postflight.patch-profile
Modified: python/branches/release30-maint/Mac/BuildScript/build-installer.py
==============================================================================

--- python/branches/release30-maint/Mac/BuildScript/build-installer.py	(original)
+++ python/branches/release30-maint/Mac/BuildScript/build-installer.py	Thu Feb 12 17:09:09 2009
@@ -1033,8 +1033,7 @@
 buildPythonDocs()
 fn = os.path.join(WORKDIR, "_root", "Applications",
 "Python %s"%(getVersion(),), "Update Shell Profile.command")
- patchFile("scripts/postflight.patch-profile", fn)
- os.chmod(fn, 0755)
+ patchScript("scripts/postflight.patch-profile", fn)
 
 folder = os.path.join(WORKDIR, "_root", "Applications", "Python %s"%(
 getVersion(),))
Modified: python/branches/release30-maint/Mac/BuildScript/scripts/postflight.patch-profile
==============================================================================
--- python/branches/release30-maint/Mac/BuildScript/scripts/postflight.patch-profile	(original)
+++ python/branches/release30-maint/Mac/BuildScript/scripts/postflight.patch-profile	Thu Feb 12 17:09:09 2009
@@ -5,8 +5,8 @@
 echo "These changes will be effective only in shell windows that you open"
 echo "after running this script."
 
-PYVER=2.5
-PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/Current"
+PYVER=@PYVER@
+PYTHON_ROOT="/Library/Frameworks/Python.framework/Versions/@PYVER@"
 
 if [ `id -ur` = 0 ]; then
 	# Run from the installer, do some trickery to fetch the information
