diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-07-24 10:09:36 (GMT) |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-07-24 10:09:36 (GMT) |
| commit | 7260abc8ad44f23f20c297256586ac6230c0c1ea (patch) | |
| tree | 7677e06c449851d05eea11835e82c1213f3ee2a9 | |
| parent | ac08e302de73e6562787a0f3a1b2f6bdb3a3181b (diff) | |
| download | cpython-7260abc8ad44f23f20c297256586ac6230c0c1ea.zip cpython-7260abc8ad44f23f20c297256586ac6230c0c1ea.tar.gz cpython-7260abc8ad44f23f20c297256586ac6230c0c1ea.tar.bz2 | |
Merged revisions 83098 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
................
r83098 | ronald.oussoren | 2010-07-23 17:12:28 +0100 (Fri, 23 Jul 2010) | 19 lines
Merged revisions 83096 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r83096 | ronald.oussoren | 2010-07-23 17:05:35 +0100 (Fri, 23 Jul 2010) | 13 lines
Ensure that sys.prefix can reliably be found
on OSX. This fixes a small issue that was exposed
by running test_subprocess through regrtest (and
hence in a subdirectory).
Without this patch running python.exe from the
build tree will fail when these tree conditions
are true:
1) the CWD is not the root of build tree
2) python.exe is found through $PATH
3) the framework is not yet installed
........
................
| -rw-r--r-- | Modules/getpath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index 9653d3e..f28f4c6 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -471,7 +471,7 @@ calculate_path(void) if (!ismodule(argv0_path)) { /* We are in the build directory so use the name of the executable - we know that the absolute path is passed */ - strncpy(argv0_path, prog, MAXPATHLEN); + strncpy(argv0_path, progpath, MAXPATHLEN); } else { /* Use the location of the library as the progpath */ |