From 938687db0255d749ed8110d68628e505967b7131 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 23 Feb 2016 21:10:13 +0000 Subject: uninative: use check_output instead of Popen directly Signed-off-by: Ross Burton --- meta/classes/uninative.bbclass | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'meta') diff --git a/meta/classes/uninative.bbclass b/meta/classes/uninative.bbclass index 7e225e6f15..270c1b0be4 100644 --- a/meta/classes/uninative.bbclass +++ b/meta/classes/uninative.bbclass @@ -83,12 +83,10 @@ python uninative_changeinterp () { except oe.qa.NotELFFileError: continue - #bb.warn("patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f)) - cmd = "patchelf-uninative --set-interpreter %s %s" % (d.getVar("UNINATIVE_LOADER", True), f) - p = subprocess.Popen(cmd, shell=True, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - stdout, stderr = p.communicate() - if p.returncode: + try: + subprocess.check_output(("patchelf-uninative", "--set-interpreter", + d.getVar("UNINATIVE_LOADER", True), f)) + except subprocess.CalledProcessError as e: bb.fatal("'%s' failed with exit code %d and the following output:\n%s" % - (cmd, p.returncode, stdout)) + (e.cmd, e.returncode, e.output)) } -- cgit v1.2.3