From b54339d63339c99f24845f69f49cd1fe996e6e7c Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 9 May 2013 14:55:04 +0000
Subject: classes/lib: Fix getcmdstatus breakage

I mistakenly thought subprocess had getcmdstatus in python 2. It doesn't so lets
add a wrapper and have this work in both worlds.

(From OE-Core rev: 2253e9f12734c6e6aa489942b5e4628eca1fa29d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/lib/oe/patch.py |  4 ++--
 meta/lib/oe/utils.py | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'meta/lib')

diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index 8de73a7037..244f6c5cf2 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -17,7 +17,7 @@ class CmdError(bb.BBHandledException):
 
 
 def runcmd(args, dir = None):
-    import subprocess, pipes
+    import pipes
 
     if dir:
         olddir = os.path.abspath(os.curdir)
@@ -30,7 +30,7 @@ def runcmd(args, dir = None):
         args = [ pipes.quote(str(arg)) for arg in args ]
         cmd = " ".join(args)
         # print("cmd: %s" % cmd)
-        (exitstatus, output) = subprocess.getstatusoutput(cmd)
+        (exitstatus, output) = oe.utils.getstatusoutput(cmd)
         if exitstatus != 0:
             raise CmdError(exitstatus >> 8, output)
         return output
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index ed9409613a..ec8260d9bd 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -1,3 +1,10 @@
+try:
+    # Python 2
+    import commands as cmdstatus
+except ImportError:
+    # Python 3
+    import subprocess as cmdstatus
+
 def read_file(filename):
     try:
         f = file( filename, "r" )
@@ -123,3 +130,6 @@ def packages_filter_out_system(d):
         if pkg not in blacklist and localepkg not in pkg:
             pkgs.append(pkg)
     return pkgs
+
+def getstatusoutput(cmd):
+    return cmdstatus.getstatusoutput(cmd)
-- 
cgit v1.2.3-54-g00ecf