[oe-commits] Christopher Larson : base.bbclass: add popen/system convenience functions

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 02630483284a2f31b01e636210715ee1fb6e63b9
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=02630483284a2f31b01e636210715ee1fb6e63b9

Author: Christopher Larson <clarson at mvista.com>
Date:   Tue Jan 19 10:00:41 2010 +0000

base.bbclass: add popen/system convenience functions

Provides oe_popen, which is a subprocess.Popen wrapper that automatically
provides our exported variables in the environment, including the PATH, and
oe_system, which is just a wrapper that acts like system.

Signed-off-by: Chris Larson <clarson at mvista.com>
Acked-by: Tom Rini <tom_rini at mentor.com>

---

 classes/base.bbclass  |    6 ------
 classes/utils.bbclass |   30 ++++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/classes/base.bbclass b/classes/base.bbclass
index ae8b74e..182ce62 100644
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -154,12 +154,6 @@ python base_do_fetch() {
 			raise bb.build.FuncFailed("Checksum of '%s' failed" % uri)
 }
 
-def subprocess_setup():
-	import signal
-	# Python installs a SIGPIPE handler by default. This is usually not what
-	# non-Python subprocesses expect.
-	signal.signal(signal.SIGPIPE, signal.SIG_DFL)
-
 def oe_unpack_file(file, data, url = None):
 	import subprocess
 	if not url:
diff --git a/classes/utils.bbclass b/classes/utils.bbclass
index ecb00ec..6ff11dd 100644
--- a/classes/utils.bbclass
+++ b/classes/utils.bbclass
@@ -1,3 +1,33 @@
+def subprocess_setup():
+   import signal
+   # Python installs a SIGPIPE handler by default. This is usually not what
+   # non-Python subprocesses expect.
+   signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+
+def oe_popen(d, cmd, **kwargs):
+    """ Convenience function to call out processes with our exported
+    variables in the environment.
+    """
+    from subprocess import Popen
+
+    if kwargs.get("env") is None:
+        env = d.getVar("__oe_popen_env", False)
+        if env is None:
+            env = {}
+            for v in d.keys():
+                if d.getVarFlag(v, "export"):
+                    env[v] = d.getVar(v, True) or ""
+            d.setVar("__oe_popen_env", env)
+        kwargs["env"] = env
+
+    kwargs["preexec_fn"] = subprocess_setup
+
+    return Popen(cmd, **kwargs)
+
+def oe_system(d, cmd):
+    """ Popen based version of os.system. """
+    return oe_popen(d, cmd, shell=True).wait()
+
 # like os.path.join but doesn't treat absolute RHS specially
 def base_path_join(a, *p):
     path = a