From 97f69eb3eeedf1b8e7e1ede85b0e930711d545d5 Mon Sep 17 00:00:00 2001 From: Michael Pimmer Date: Wed, 24 Oct 2018 05:42:47 +0000 Subject: [PATCH] Actions: path in development mode: do not preserve PYTHONPATH Reviewed-by: James Valleroy --- plinth/actions.py | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/plinth/actions.py b/plinth/actions.py index 8d42d84e0..f9d9c909f 100644 --- a/plinth/actions.py +++ b/plinth/actions.py @@ -176,8 +176,7 @@ def _run(action, options=None, input=None, run_in_background=False, if cfg.develop and sudo_call: # Passing 'env' does not work with sudo, so append the PYTHONPATH # as part of the command - pythonpath = _get_local_pythonpath() - sudo_call += ["PYTHONPATH=%s" % pythonpath] + sudo_call += ["PYTHONPATH=%s" % cfg.root] if sudo_call: cmd = sudo_call + cmd @@ -193,7 +192,7 @@ def _run(action, options=None, input=None, run_in_background=False, } if cfg.develop: # In development mode pass on local pythonpath to access Plinth - kwargs['env'] = {'PYTHONPATH': _get_local_pythonpath()} + kwargs['env'] = {'PYTHONPATH': cfg.root} proc = subprocess.Popen(cmd, **kwargs) if not run_in_background: @@ -208,17 +207,3 @@ def _run(action, options=None, input=None, run_in_background=False, return output else: return proc - -def _get_local_pythonpath(): - """Use local plinth folder in pythonpath instead of system plinth""" - pythonpath = cfg.root - try: - current_pythonpath = os.environ['PYTHONPATH'] - except KeyError: - pass - else: - current_pythonpath = current_pythonpath.strip(os.path.pathsep) - if current_pythonpath: - pythonpath += os.path.pathsep.join([pythonpath, - current_pythonpath]) - return pythonpath