From ea8a46baaa3358e140baac0ad6244d72789da700 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Thu, 24 Apr 2008 18:18:28 +0000 Subject: [PATCH] Fix a bug where the user's environment wasn't passed through the local runner. --- lib/galaxy/jobs/runners/local.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/galaxy/jobs/runners/local.py b/lib/galaxy/jobs/runners/local.py index 7ec934752a8..58e2d6939ef 100644 --- a/lib/galaxy/jobs/runners/local.py +++ b/lib/galaxy/jobs/runners/local.py @@ -53,13 +53,12 @@ class LocalJobRunner( object ): return # If we were able to get a command line, run the job if command_line: + env = os.environ if job_wrapper.galaxy_lib_dir is not None: if 'PYTHONPATH' in os.environ: - env = { 'PYTHONPATH' : "%s:%s" % ( os.environ['PYTHONPATH'], job_wrapper.galaxy_lib_dir ) } + env['PYTHONPATH'] = "%s:%s" % ( os.environ['PYTHONPATH'], job_wrapper.galaxy_lib_dir ) else: - env = { 'PYTHONPATH' : job_wrapper.galaxy_lib_dir } - else: - env = {} + env['PYTHONPATH'] = job_wrapper.galaxy_lib_dir try: log.debug( 'executing: %s' % command_line ) proc = subprocess.Popen( args = command_line,