meta: python3 megapatch

This needs splutting into smaller units, WIP atm.

(From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/meta/classes/metadata_scm.bbclass b/meta/classes/metadata_scm.bbclass
index 2e6fac209a..257df3c99a 100644
--- a/meta/classes/metadata_scm.bbclass
+++ b/meta/classes/metadata_scm.bbclass
@@ -69,8 +69,8 @@ def base_get_metadata_git_branch(path, d):
     try:
         rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path)
     except bb.process.ExecutionError:
-        rev = '<unknown>'
-    return rev.strip()
+        return '<unknown>'
+    return rev.strip().decode("utf-8")
 
 def base_get_metadata_git_revision(path, d):
     import bb.process
@@ -78,5 +78,6 @@ def base_get_metadata_git_revision(path, d):
     try:
         rev, _ = bb.process.run('git rev-parse HEAD', cwd=path)
     except bb.process.ExecutionError:
-        rev = '<unknown>'
-    return rev.strip()
+        return '<unknown>'
+    return rev.strip().decode("utf-8") 
+