Skip to content

Commit

Permalink
insane.bbclass: use bb.process.Popen instead of subprocess.check_output
Browse files Browse the repository at this point in the history
subprocess.check_output was only introduced in Python v2.7, so we
cannot use it. This refactors the QA test to use bb.process.Popen
instead.

This fixes the error:

AttributeError: 'module' object has no attribute 'check_output'

It no longer checks the return status of prelink-rtld, as that
case was simply adding noise. This QA test is intended to only
warn about specific paths that binaries could be linking to, not
handle the case where there is a missing library.

Signed-off-by: Scott Garman <[email protected]>
Signed-off-by: Richard Purdie <[email protected]>
  • Loading branch information
Scott Garman authored and rpurdie committed Jan 5, 2012
1 parent 563828b commit 0443487
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions meta/classes/insane.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -227,16 +227,12 @@ def package_qa_check_unsafe_references_in_binaries(path, name, d, elf, messages)
sysroot_path_usr = sysroot_path + exec_prefix

try:
ldd_output = sub.check_output(["prelink-rtld", "--root", sysroot_path, path])
except sub.CalledProcessError as e:
if e.returncode != 127:
error_msg = pn + ": prelink-rtld aborted when processing %s" % path
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
return False
else:
# Sometimes this is done deliberately (e.g, e2fsprogs), so only warn
bb.warn("%s has missing library dependencies" % path)
return
ldd_output = bb.process.Popen(["prelink-rtld", "--root", sysroot_path, path], stdout=sub.PIPE).stdout.read()
except bb.process.CmdError:
error_msg = pn + ": prelink-rtld aborted when processing %s" % path
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
return False

if sysroot_path_usr in ldd_output:
error_msg = pn + ": %s links to something under exec_prefix" % path
package_qa_handle_error("unsafe-references-in-binaries", error_msg, d)
Expand Down

0 comments on commit 0443487

Please sign in to comment.