summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
authorMariano Lopez <mariano.lopez@linux.intel.com>2016-06-06 07:15:39 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-07 15:22:38 +0100
commit84441a96f0d369634c4a777ba3bc135a9893fc95 (patch)
tree88ded1fa44479a7290b5825b583baacba9c8110d /meta/lib/oe
parentd28781bb56b6a2cd171a73d10266dedcc78da595 (diff)
downloadpoky-84441a96f0d369634c4a777ba3bc135a9893fc95.tar.gz
oe/lib/pacakge_manager.py: Update missing pipeline decoding
Adds decoding needed by some commands output later used as strings. [YOCTO #9702] (From OE-Core rev: 0440b5ace411c61f802376d4e1c9eac93e72d65f) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/package_manager.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 3b1d24fff2..4aaff8ca43 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -1411,7 +1411,7 @@ class RpmPM(PackageManager):
1411 def package_info(self, pkg): 1411 def package_info(self, pkg):
1412 cmd = "%s %s info --urls %s" % (self.smart_cmd, self.smart_opt, pkg) 1412 cmd = "%s %s info --urls %s" % (self.smart_cmd, self.smart_opt, pkg)
1413 try: 1413 try:
1414 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) 1414 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
1415 except subprocess.CalledProcessError as e: 1415 except subprocess.CalledProcessError as e:
1416 bb.fatal("Unable to list available packages. Command '%s' " 1416 bb.fatal("Unable to list available packages. Command '%s' "
1417 "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) 1417 "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))
@@ -1506,7 +1506,7 @@ class OpkgDpkgPM(PackageManager):
1506 def package_info(self, pkg, cmd): 1506 def package_info(self, pkg, cmd):
1507 1507
1508 try: 1508 try:
1509 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True) 1509 output = subprocess.check_output(cmd, stderr=subprocess.STDOUT, shell=True).decode("utf-8")
1510 except subprocess.CalledProcessError as e: 1510 except subprocess.CalledProcessError as e:
1511 bb.fatal("Unable to list available packages. Command '%s' " 1511 bb.fatal("Unable to list available packages. Command '%s' "
1512 "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8"))) 1512 "returned %d:\n%s" % (cmd, e.returncode, e.output.decode("utf-8")))