From 1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 9 May 2013 16:31:22 +0000 Subject: meta: python3 megapatch This needs splutting into smaller units, WIP atm. (From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e) Signed-off-by: Richard Purdie --- meta/classes/metadata_scm.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'meta/classes/metadata_scm.bbclass') 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 = '' - return rev.strip() + return '' + 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 = '' - return rev.strip() + return '' + return rev.strip().decode("utf-8") + -- cgit v1.2.3-54-g00ecf