diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-11 10:53:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-11 10:53:12 +0000 |
| commit | 6e8ee38aafb1d4efbb1810913593316fc6635854 (patch) | |
| tree | 867262c8b0090087357179aa3ff20f47bbc71270 /scp2 | |
| parent | 6fd417292eaa3118e9aa3e934b2b55ad97613549 (diff) | |
INTEGRATION: CWS pyunofixes4 (1.8.522); FILE MERGED
2007/08/07 20:38:59 jbu 1.8.522.1: #i56236# fix the nameclash between the PYTHONPATH environment variable and the loader bootstrap parameter by adding the PYUNO_LOADER prefix
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/python/profileitem_python.scp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 74c41ff14518..95b37397a442 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -4,9 +4,9 @@ * * $RCSfile: profileitem_python.scp,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: obo $ $Date: 2006-03-22 10:57:50 $ + * last change: $Author: kz $ $Date: 2007-10-11 11:53:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -53,7 +53,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome ModuleID = gid_Module_Optional_Pyuno; Section = "Bootstrap"; Order = 1; - Key = "PYTHONHOME"; + Key = "PYUNO_LOADER_PYTHONHOME"; Value = CONCAT2($ORIGIN/python-core-,PYVERSION); End #endif @@ -63,7 +63,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath ModuleID = gid_Module_Optional_Pyuno; Section = "Bootstrap"; Order = 1; - Key = "PYTHONPATH"; + Key = "PYUNO_LOADER_PYTHONPATH"; #ifdef SYSTEM_PYTHON Value = "$ORIGIN"; #else |