nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Actions: path in development mode: do not preserve PYTHONPATH

Browse Source 
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Michael Pimmer 2018-10-24 05:42:47 +00:00 committed by James Valleroy
parent 525638357f
commit 97f69eb3ee
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
plinth/actions.py
View File

@ -176,8 +176,7 @@ def _run(action, options=None, input=None, run_in_background=False,
if cfg.develop and sudo_call: if cfg.develop and sudo_call:
# Passing 'env' does not work with sudo, so append the PYTHONPATH # Passing 'env' does not work with sudo, so append the PYTHONPATH
# as part of the command # as part of the command
pythonpath = _get_local_pythonpath() sudo_call += ["PYTHONPATH=%s" % cfg.root]
sudo_call += ["PYTHONPATH=%s" % pythonpath]
if sudo_call: if sudo_call:
cmd = sudo_call + cmd cmd = sudo_call + cmd
@ -193,7 +192,7 @@ def _run(action, options=None, input=None, run_in_background=False,
} }
if cfg.develop: if cfg.develop:
# In development mode pass on local pythonpath to access Plinth # 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) proc = subprocess.Popen(cmd, **kwargs)
if not run_in_background: if not run_in_background:
@ -208,17 +207,3 @@ def _run(action, options=None, input=None, run_in_background=False,
return output return output
else: else:
return proc 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