diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 14:55:04 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:05:08 +0100 |
| commit | b54339d63339c99f24845f69f49cd1fe996e6e7c (patch) | |
| tree | 73b3da57a66ab4a0f6fa06a479efc5449126342f /meta/lib/oe/utils.py | |
| parent | d529c11fa512e7f06044378a7ec7137765ea8eb4 (diff) | |
| download | poky-b54339d63339c99f24845f69f49cd1fe996e6e7c.tar.gz | |
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>
Diffstat (limited to 'meta/lib/oe/utils.py')
| -rw-r--r-- | meta/lib/oe/utils.py | 10 |
1 files changed, 10 insertions, 0 deletions
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 @@ | |||
| 1 | try: | ||
| 2 | # Python 2 | ||
| 3 | import commands as cmdstatus | ||
| 4 | except ImportError: | ||
| 5 | # Python 3 | ||
| 6 | import subprocess as cmdstatus | ||
| 7 | |||
| 1 | def read_file(filename): | 8 | def read_file(filename): |
| 2 | try: | 9 | try: |
| 3 | f = file( filename, "r" ) | 10 | f = file( filename, "r" ) |
| @@ -123,3 +130,6 @@ def packages_filter_out_system(d): | |||
| 123 | if pkg not in blacklist and localepkg not in pkg: | 130 | if pkg not in blacklist and localepkg not in pkg: |
| 124 | pkgs.append(pkg) | 131 | pkgs.append(pkg) |
| 125 | return pkgs | 132 | return pkgs |
| 133 | |||
| 134 | def getstatusoutput(cmd): | ||
| 135 | return cmdstatus.getstatusoutput(cmd) | ||
