diff options
| author | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:14:02 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2010-04-11 22:14:02 (GMT) |
| commit | 051858e8a0ebf4b8df6bb817658ef02dcefeac3b (patch) | |
| tree | cc5d278fbc4c54c51056dc48c9ddd55e1b620302 /Mac | |
| parent | a0820897a8579534b8cf6ea09be2c2431f7107f9 (diff) | |
| download | cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.zip cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.tar.gz cpython-051858e8a0ebf4b8df6bb817658ef02dcefeac3b.tar.bz2 | |
Merged revisions 79902 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79902 | ronald.oussoren | 2010-04-08 03:13:31 -0500 (Thu, 08 Apr 2010) | 9 lines
This check-in fixes two problems:
1) A non-critical off-by-one error in pythonw
2) A problem in the configure script that caused
builds with '--enable-framework --enable-universalsdk=/'
to fail on OSX 10.6.
........
Diffstat (limited to 'Mac')
| -rw-r--r-- | Mac/Tools/pythonw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mac/Tools/pythonw.c b/Mac/Tools/pythonw.c index 5fc59b5..1f3e0ce 100644 --- a/Mac/Tools/pythonw.c +++ b/Mac/Tools/pythonw.c @@ -78,7 +78,7 @@ static char* get_python_path(void) end --; } end++; - if (end[1] == '.') { + if (*end == '.') { end++; } strcpy(end, "Resources/Python.app/Contents/MacOS/" PYTHONFRAMEWORK); @@ -161,7 +161,7 @@ main(int argc, char **argv) { setup_spawnattr(&spawnattr); posix_spawn(NULL, exec_path, NULL, &spawnattr, argv, environ); - err(1, "posix_spawn: %s", argv[0]); + err(1, "posix_spawn: %s", exec_path); } #endif execve(exec_path, argv, environ); |