From 131c92c069d07f01b9492522f257e7668f32631e Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Fri, 6 Feb 1998 22:29:30 +0000 Subject: [PATCH] - Use Py_GetPythonHome() instead of getenv("PYTHONHOME"). - Don't print error messages when Py_FrozenFlag is set. --- Modules/getpath.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Modules/getpath.c b/Modules/getpath.c index 88daadced86..589b7aec4f6 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -385,7 +385,7 @@ calculate_path() static char separator[2] = {SEP, '\0'}; char *pythonpath = PYTHONPATH; char *rtpypath = getenv("PYTHONPATH"); - char *home = getenv("PYTHONHOME"); + char *home = Py_GetPythonHome(); char *path = getenv("PATH"); char *prog = Py_GetProgramName(); char argv0_path[MAXPATHLEN+1]; @@ -454,6 +454,7 @@ calculate_path() reduce(argv0_path); if (!(pfound = search_for_prefix(argv0_path, home))) { + if (!Py_FrozenFlag) fprintf(stderr, "Could not find platform independent libraries \n"); strcpy(prefix, PREFIX); @@ -463,6 +464,7 @@ calculate_path() reduce(prefix); if (!(efound = search_for_exec_prefix(argv0_path, home))) { + if (!Py_FrozenFlag) fprintf(stderr, "Could not find platform dependent libraries \n"); strcpy(exec_prefix, EXEC_PREFIX); @@ -470,7 +472,7 @@ calculate_path() } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ - if (!pfound || !efound) + if ((!pfound || !efound) && !Py_FrozenFlag) fprintf(stderr, "Consider setting $PYTHONHOME to [:]\n");