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.
........
This commit is contained in:
Benjamin Peterson 2010-04-11 22:14:02 +00:00
parent a0820897a8
commit 051858e8a0
2 changed files with 3 additions and 32 deletions

View file

@ -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);