[Python-checkins] r83097 - in python/branches/release31-maint: Modules/getpath.c

[ronald.oussoren]

Author: ronald.oussoren
Date: Fri Jul 23 18:09:28 2010
New Revision: 83097

Log:
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
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/getpath.c

Modified: python/branches/release31-maint/Modules/getpath.c
==============================================================================
--- python/branches/release31-maint/Modules/getpath.c	(original)
+++ python/branches/release31-maint/Modules/getpath.c	Fri Jul 23 18:09:28 2010
@@ -552,7 +552,7 @@
         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 */