From: Tom Clegg <tom@clinicalfuture.com>
Date: Wed, 17 Jul 2013 01:50:36 +0000 (-0400)
Subject: prepend to PYTHONPATH instead of replacing
X-Git-Tag: 1.1.0~3079
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ee25f10b51938959d0ec0333474b9e2d8f3f14a3

prepend to PYTHONPATH instead of replacing
---

diff --git a/services/crunch/crunch-job b/services/crunch/crunch-job
index 6c0031c617..4601c5a477 100755
--- a/services/crunch/crunch-job
+++ b/services/crunch/crunch-job
@@ -572,7 +572,8 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .=
 	  "&& perl -";
     }
-    $ENV{"PYTHONPATH"} = "$ENV{CRUNCH_SRC}/sdk/python"; # xxx hack
+    $ENV{"PYTHONPATH"} =~ s{^}{:} if $ENV{"PYTHONPATH"};
+    $ENV{"PYTHONPATH"} =~ s{^}{$ENV{CRUNCH_SRC}/sdk/python}; # xxx hack
     $command .=
         "&& exec $ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     my @execargs = ('bash', '-c', $command);