From: Ross Burton <ross.burton@intel.com>
Date: Thu, 21 Jul 2016 14:59:40 +0000 (+0100)
Subject: lib/oe/gpg_sign: fix output in error paths
X-Git-Tag: uninative-1.3~190
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ce24d4c3632b71939ad198268a900ee823a89b27;p=openembedded-core.git

lib/oe/gpg_sign: fix output in error paths

oe.utils.getstatusoutput() is a wrapper for subprocess.getstatusoutput() which
uses Universal Newlines, so the output is a str() not bytes().

Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/lib/oe/gpg_sign.py b/meta/lib/oe/gpg_sign.py
index a8a478aa95..38eb0cb137 100644
--- a/meta/lib/oe/gpg_sign.py
+++ b/meta/lib/oe/gpg_sign.py
@@ -24,7 +24,7 @@ class LocalSigner(object):
         status, output = oe.utils.getstatusoutput(cmd)
         if status:
             raise bb.build.FuncFailed('Failed to export gpg public key (%s): %s' %
-                                      (keyid, output.decode("utf-8")))
+                                      (keyid, output))
 
     def sign_rpms(self, files, keyid, passphrase):
         """Sign RPM files"""
@@ -39,7 +39,7 @@ class LocalSigner(object):
 
         status, output = oe.utils.getstatusoutput(cmd)
         if status:
-            raise bb.build.FuncFailed("Failed to sign RPM packages: %s" % output.decode("utf-8"))
+            raise bb.build.FuncFailed("Failed to sign RPM packages: %s" % output)
 
     def detach_sign(self, input_file, keyid, passphrase_file, passphrase=None, armor=True):
         """Create a detached signature of a file"""
@@ -113,4 +113,3 @@ def get_signer(d, backend):
         return LocalSigner(d)
     else:
         bb.fatal("Unsupported signing backend '%s'" % backend)
-