Kaydet (Commit) 6e8ee38a authored tarafından Kurt Zenker's avatar Kurt Zenker

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
üst 6fd41729
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
* *
* $RCSfile: profileitem_python.scp,v $ * $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 Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
...@@ -53,7 +53,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome ...@@ -53,7 +53,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome
ModuleID = gid_Module_Optional_Pyuno; ModuleID = gid_Module_Optional_Pyuno;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
Key = "PYTHONHOME"; Key = "PYUNO_LOADER_PYTHONHOME";
Value = CONCAT2($ORIGIN/python-core-,PYVERSION); Value = CONCAT2($ORIGIN/python-core-,PYVERSION);
End End
#endif #endif
...@@ -63,7 +63,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath ...@@ -63,7 +63,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath
ModuleID = gid_Module_Optional_Pyuno; ModuleID = gid_Module_Optional_Pyuno;
Section = "Bootstrap"; Section = "Bootstrap";
Order = 1; Order = 1;
Key = "PYTHONPATH"; Key = "PYUNO_LOADER_PYTHONPATH";
#ifdef SYSTEM_PYTHON #ifdef SYSTEM_PYTHON
Value = "$ORIGIN"; Value = "$ORIGIN";
#else #else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment