Remove PYTHONPATH hack.
authorTom Clegg <tom@curoverse.com>
Tue, 11 Mar 2014 16:03:51 +0000 (12:03 -0400)
committerTom Clegg <tom@curoverse.com>
Tue, 11 Mar 2014 16:03:51 +0000 (12:03 -0400)
sdk/cli/bin/crunch-job

index 2ba36f2b25ba939957ee3c6fb81baad66797a16e..4c8acbb59a5ad917dd1f3d43203bb203fe84f4f3 100755 (executable)
@@ -580,10 +580,6 @@ for (my $todo_ptr = 0; $todo_ptr <= $#jobstep_todo; $todo_ptr ++)
       $command .=
          "&& perl -";
     }
-    $ENV{"PYTHONPATH"} =~ s{^}{:} if $ENV{"PYTHONPATH"};
-    $ENV{"PYTHONPATH"} =~ s{^}{$ENV{CRUNCH_SRC}/sdk/python}; # xxx hack
-    $ENV{"PYTHONPATH"} =~ s{^}{$ENV{CRUNCH_SRC}/arvados/sdk/python:}; # xxx hack
-    $ENV{"PYTHONPATH"} =~ s{$}{:/usr/local/arvados/src/sdk/python}; # xxx hack
     $command .=
         "&& exec arv-mount $ENV{TASK_KEEPMOUNT} --exec $ENV{CRUNCH_SRC}/crunch_scripts/" . $Job->{"script"};
     my @execargs = ('bash', '-c', $command);