Merged revisions 70167 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r70167 | ronald.oussoren | 2009-03-04 22:07:19 +0100 (Wed, 04 Mar 2009) | 2 lines

  Fix issue 5224.
........

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 2408960d9499a91e2d1101c3185e03d2534a2689..559b5de1560805d34dd30e4acb50f114406a948d 100755 (executable)
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -1031,8 +1031,7 @@ def main():
     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(),))

diff --git a/Mac/BuildScript/scripts/postflight.patch-profile b/Mac/BuildScript/scripts/postflight.patch-profile
index 4aba4b92839e4cc67bdf913e59ce411f6eb4b886..aa5e93c683020e9199378cdb36700b3438476d48 100755 (executable)
--- a/Mac/BuildScript/scripts/postflight.patch-profile
+++ b/Mac/BuildScript/scripts/postflight.patch-profile
@@ -5,8 +5,8 @@ echo "of python is not early enough of the PATH of your shell."
 echo "These changes will be effective only in shell windows that you open"
 echo "after running this script."
 
-PYVER=2.6
-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