diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-20 11:17:05 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-06-02 08:24:00 +0100 |
| commit | a7309d5790f5dac46e84d3c14959943eb2496fda (patch) | |
| tree | 48e1fcb886b8ef2974bade09694356f3230fb8a8 /meta/classes/toaster.bbclass | |
| parent | 297438e965053b2eb56cc8ef3e59465642f10a24 (diff) | |
| download | poky-a7309d5790f5dac46e84d3c14959943eb2496fda.tar.gz | |
classes/lib: Update to use python3 command pipeline decoding
In python3, strings are unicode by default. We need to encode/decode
from command pipelines and other places where we interface with the
real world using the correct locales. This patch updates various
call sites to use the correct encoding/decodings.
(From OE-Core rev: bb4685af1bffe17b3aa92a6d21398f38a44ea874)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/toaster.bbclass')
| -rw-r--r-- | meta/classes/toaster.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/toaster.bbclass b/meta/classes/toaster.bbclass index 1a70f14a92..1878fe095d 100644 --- a/meta/classes/toaster.bbclass +++ b/meta/classes/toaster.bbclass | |||
| @@ -33,6 +33,7 @@ python toaster_layerinfo_dumpdata() { | |||
| 33 | 33 | ||
| 34 | def _get_git_branch(layer_path): | 34 | def _get_git_branch(layer_path): |
| 35 | branch = subprocess.Popen("git symbolic-ref HEAD 2>/dev/null ", cwd=layer_path, shell=True, stdout=subprocess.PIPE).communicate()[0] | 35 | branch = subprocess.Popen("git symbolic-ref HEAD 2>/dev/null ", cwd=layer_path, shell=True, stdout=subprocess.PIPE).communicate()[0] |
| 36 | branch = branch.decode('utf-8') | ||
| 36 | branch = branch.replace('refs/heads/', '').rstrip() | 37 | branch = branch.replace('refs/heads/', '').rstrip() |
| 37 | return branch | 38 | return branch |
| 38 | 39 | ||