diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-08-23 16:07:28 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 18:02:19 +0100 |
| commit | f1a1b31add242380490023c2ee7eec1b4fbcd85b (patch) | |
| tree | b03815562e18e1b0ffc60a44676b1e625d33f666 | |
| parent | 2a06abb258768504a3ad97f61c987709227d7109 (diff) | |
| download | openembedded-core-f1a1b31add242380490023c2ee7eec1b4fbcd85b.tar.gz openembedded-core-f1a1b31add242380490023c2ee7eec1b4fbcd85b.tar.bz2 openembedded-core-f1a1b31add242380490023c2ee7eec1b4fbcd85b.zip | |
compress_doc.bbclass: Clean up getstatusoutput usage
Replace usage of oe.utils.getstatusoutput() with direct subprocess calls.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/compress_doc.bbclass | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/classes/compress_doc.bbclass b/meta/classes/compress_doc.bbclass index 069d53492e..45bb8fff65 100644 --- a/meta/classes/compress_doc.bbclass +++ b/meta/classes/compress_doc.bbclass @@ -79,6 +79,7 @@ def _collect_hardlink(hardlink_dict, file): return hardlink_dict def _process_hardlink(hardlink_dict, compress_mode, shell_cmds, decompress=False): + import subprocess for target in hardlink_dict: if decompress: compress_format = _get_compress_format(target, shell_cmds.keys()) @@ -87,7 +88,7 @@ def _process_hardlink(hardlink_dict, compress_mode, shell_cmds, decompress=False else: cmd = "%s -f %s" % (shell_cmds[compress_mode], target) bb.note('compress hardlink %s' % target) - (retval, output) = oe.utils.getstatusoutput(cmd) + (retval, output) = subprocess.getstatusoutput(cmd) if retval: bb.warn("de/compress file failed %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) return @@ -176,7 +177,7 @@ def compress_doc(topdir, compress_mode, compress_cmds): # Normal file elif os.path.isfile(file): cmd = "%s %s" % (compress_cmds[compress_mode], file) - (retval, output) = oe.utils.getstatusoutput(cmd) + (retval, output) = subprocess.getstatusoutput(cmd) if retval: bb.warn("compress failed %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) continue @@ -206,7 +207,7 @@ def decompress_doc(topdir, compress_mode, decompress_cmds): # Normal file elif os.path.isfile(file): cmd = "%s %s" % (decompress_cmds[compress_format], file) - (retval, output) = oe.utils.getstatusoutput(cmd) + (retval, output) = subprocess.getstatusoutput(cmd) if retval: bb.warn("decompress failed %s (cmd was %s)%s" % (retval, cmd, ":\n%s" % output if output else "")) continue |