summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Ohly <patrick.ohly@intel.com>2016-04-04 15:41:42 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-05 09:55:47 +0100
commit7d9e915224a9bc451fddfbbfad533d9b06e9987d (patch)
treef3ca9ac5d4cf09bf1b6da863a5dfdb767eac9be1
parent2a8d0df47c9d28f8ca7285861dee7a178273eae4 (diff)
downloadopenembedded-core-contrib-7d9e915224a9bc451fddfbbfad533d9b06e9987d.tar.gz
openembedded-core-contrib-7d9e915224a9bc451fddfbbfad533d9b06e9987d.tar.bz2
openembedded-core-contrib-7d9e915224a9bc451fddfbbfad533d9b06e9987d.zip
package_manager.py: better error handling in opkg's package listing
opkg does not return a non-zero exit code even if it found errors. When that happens, parsing the output leads to strange follow-up errors. To avoid this we need to check explicitly for non-empty stderr. Reporting only that on a failure also leads to shorter error messages (stdout may be very large). Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/package_manager.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 0d23d8bc89..b4b359a8c6 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -468,13 +468,16 @@ class OpkgPkgsList(PkgsList):
def list_pkgs(self, format=None):
cmd = "%s %s status" % (self.opkg_cmd, self.opkg_args)
- try:
- # bb.note(cmd)
- cmd_output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).strip()
-
- except subprocess.CalledProcessError as e:
+ # opkg returns success even when it printed some
+ # "Collected errors:" report to stderr. Mixing stderr into
+ # stdout then leads to random failures later on when
+ # parsing the output. To avoid this we need to collect both
+ # output streams separately and check for empty stderr.
+ p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+ cmd_output, cmd_stderr = p.communicate()
+ if p.returncode or cmd_stderr:
bb.fatal("Cannot get the installed packages list. Command '%s' "
- "returned %d:\n%s" % (cmd, e.returncode, e.output))
+ "returned %d and stderr:\n%s" % (cmd, p.returncode, cmd_stderr))
return self.opkg_query(cmd_output)