From: Joshua Lock <josh@linux.intel.com>
Date: Wed, 8 Sep 2010 17:38:43 +0000 (+0100)
Subject: bitbake: save the initial PATH for use when starting a subprocess
X-Git-Tag: 2011-1~4569
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3e7db72216472050366c3059219660dea057e80b;p=openembedded-core.git

bitbake: save the initial PATH for use when starting a subprocess

It was possible for bitbake-runtime to be run against a semi-installed
python-native resulting in tracebacks with ImportError's.

To prevent this we stash the initial PATH in the BBConfiguration when bitbake
is started and then set this in the env when launching bitbake-runtask through
subprocesses Popen() call.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index 4e6815e46e..b046156b49 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -157,6 +157,7 @@ Default BBFILES are the .bb files in the current directory.""")
 
     configuration = BBConfiguration(options)
     configuration.pkgs_to_build.extend(args[1:])
+    configuration.initial_path = os.environ['PATH']
 
     #server = bb.server.xmlrpc
     server = bb.server.none
diff --git a/bitbake/lib/bb/runqueue.py b/bitbake/lib/bb/runqueue.py
index 3d84bb17ee..4d1dc49d78 100644
--- a/bitbake/lib/bb/runqueue.py
+++ b/bitbake/lib/bb/runqueue.py
@@ -1042,6 +1042,7 @@ class RunQueueExecute:
                     env[comps[0]] = comps[1]
 
             env['BB_TASKHASH'] = self.rqdata.runq_hash[task]
+            env['PATH'] = self.cooker.configuration.initial_path
 
             sys.stdout.flush()
             sys.stderr.flush()