Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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
  ........
................
This commit is contained in:
Ronald Oussoren 2010-07-24 10:09:36 +00:00
parent ac08e302de
commit 7260abc8ad
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/getpath.c
View File

@ -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 */