diff options
Diffstat (limited to 'meta/classes/metadata_scm.bbclass')
| -rw-r--r-- | meta/classes/metadata_scm.bbclass | 9 |
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): | |||
| 69 | try: | 69 | try: |
| 70 | rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path) | 70 | rev, _ = bb.process.run('git rev-parse --abbrev-ref HEAD', cwd=path) |
| 71 | except bb.process.ExecutionError: | 71 | except bb.process.ExecutionError: |
| 72 | rev = '<unknown>' | 72 | return '<unknown>' |
| 73 | return rev.strip() | 73 | return rev.strip().decode("utf-8") |
| 74 | 74 | ||
| 75 | def base_get_metadata_git_revision(path, d): | 75 | def base_get_metadata_git_revision(path, d): |
| 76 | import bb.process | 76 | import bb.process |
| @@ -78,5 +78,6 @@ def base_get_metadata_git_revision(path, d): | |||
| 78 | try: | 78 | try: |
| 79 | rev, _ = bb.process.run('git rev-parse HEAD', cwd=path) | 79 | rev, _ = bb.process.run('git rev-parse HEAD', cwd=path) |
| 80 | except bb.process.ExecutionError: | 80 | except bb.process.ExecutionError: |
| 81 | rev = '<unknown>' | 81 | return '<unknown>' |
| 82 | return rev.strip() | 82 | return rev.strip().decode("utf-8") |
| 83 | |||
