diff options
| author | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-07-23 16:09:28 +0000 |
|---|---|---|
| committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2010-07-23 16:09:28 +0000 |
| commit | 6d70850bf09ad049e9a91c2ceb465ca974751251 (patch) | |
| tree | 619133e7717df249462ee322378d1c656ee669da | |
| parent | 47076f7897427d34a8025c1b4f330d1312facc83 (diff) | |
| download | cpython-git-6d70850bf09ad049e9a91c2ceb465ca974751251.tar.gz | |
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 3d45235f6c..bbcedf1562 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -552,7 +552,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 */ - wcsncpy(argv0_path, prog, MAXPATHLEN); + wcsncpy(argv0_path, progpath, MAXPATHLEN); } else { /* Use the location of the library as the progpath */ |