diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-04 21:10:17 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-04 21:10:17 (GMT) |
| commit | 03674a3855c8094f58019929c25e8d98ae9754af (patch) | |
| tree | 33ffeaf8ad96d8d87765754bf111dfe8c7261999 /Mac/BuildScript | |
| parent | 857c00e0fd026433962a95d1f4551fcde88e601c (diff) | |
| download | cpython-03674a3855c8094f58019929c25e8d98ae9754af.zip cpython-03674a3855c8094f58019929c25e8d98ae9754af.tar.gz cpython-03674a3855c8094f58019929c25e8d98ae9754af.tar.bz2 | |
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.
........
Diffstat (limited to 'Mac/BuildScript')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 3 | ||||
| -rwxr-xr-x | Mac/BuildScript/scripts/postflight.patch-profile | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 2408960..559b5de 100755 --- 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 4aba4b9..aa5e93c 100755 --- 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 |