Commit a6fc7dfe authored by Nicolas Delaby's avatar Nicolas Delaby

Support passing dictionary with variable environments reads from configuration file.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@42224 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent b2573fa8
...@@ -85,17 +85,21 @@ class OpenOffice(Application): ...@@ -85,17 +85,21 @@ class OpenOffice(Application):
self.request = 0 self.request = 0
def loadSettings(self, hostname, port, path_run_dir, display_id, def loadSettings(self, hostname, port, path_run_dir, display_id,
office_binary_path, uno_path, default_language, **kw): office_binary_path, uno_path, default_language,
environment_dict=None, **kw):
"""Method to load the configuratio to control one OpenOffice Instance """Method to load the configuratio to control one OpenOffice Instance
Keyword arguments: Keyword arguments:
office_path -- Full Path of the OOo executable. office_path -- Full Path of the OOo executable.
e.g office_binary_path='/opt/openoffice.org3/program' e.g office_binary_path='/opt/openoffice.org3/program'
uno_path -- Full path of the Uno Library uno_path -- Full path of the Uno Library
""" """
if environment_dict is None:
environment_dict = {}
Application.loadSettings(self, hostname, port, path_run_dir, display_id) Application.loadSettings(self, hostname, port, path_run_dir, display_id)
self.office_binary_path = office_binary_path self.office_binary_path = office_binary_path
self.uno_path = uno_path self.uno_path = uno_path
self.default_language = default_language self.default_language = default_language
self.environment_dict = environment_dict
def _startProcess(self, command, env): def _startProcess(self, command, env):
"""Start OpenOffice.org process""" """Start OpenOffice.org process"""
...@@ -150,7 +154,7 @@ class OpenOffice(Application): ...@@ -150,7 +154,7 @@ class OpenOffice(Application):
] ]
# To run the instance OOo is need a environment. So, the "DISPLAY" of Xvfb # To run the instance OOo is need a environment. So, the "DISPLAY" of Xvfb
# is passed to env and the environment customized is passed to the process # is passed to env and the environment customized is passed to the process
env = {} env = self.environment_dict.copy()
env["LANG"] = "UTF-8" env["LANG"] = "UTF-8"
env["HOME"] = self.path_user_installation env["HOME"] = self.path_user_installation
env["TMP"] = self.path_user_installation env["TMP"] = self.path_user_installation
......
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