From 4b548fa0c2220f5433734571f304a8ea92b2c1f3 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Tue, 9 Mar 2010 09:48:00 -0500 Subject: [PATCH] unset PYTHONPATH when dist-scrambling since even with -ES, use_setuptools() will read PYTHONPATH and site-packages. Fixes scrambling docutils when another docutils is in your PYTHONPATH or site-packages. --- lib/galaxy/eggs/dist.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/eggs/dist.py b/lib/galaxy/eggs/dist.py index 886cd252915..3037e97faeb 100644 --- a/lib/galaxy/eggs/dist.py +++ b/lib/galaxy/eggs/dist.py @@ -23,7 +23,7 @@ class DistScrambleEgg( ScrambleEgg ): def run_scramble_script( self ): log.warning( "%s(): Beginning build" % sys._getframe().f_code.co_name ) # subprocessed to sterilize the env - cmd = "ssh %s 'cd %s; %s -ES %s'" % ( self.build_host, self.buildpath, self.python, 'scramble.py' ) + cmd = "ssh %s 'cd %s; PYTHONPATH= %s -ES %s'" % ( self.build_host, self.buildpath, self.python, 'scramble.py' ) log.debug( '%s(): Executing:' % sys._getframe().f_code.co_name ) log.debug( ' %s' % cmd ) p = subprocess.Popen( args = cmd, shell = True )