From: Ross Burton <ross.burton@intel.com>
To: bitbake-devel@lists.openembedded.org
Subject: [PATCH] lib/bb/build.py: decode the command as UTF-8
Date: Fri, 15 Jul 2016 11:27:22 +0100 [thread overview]
Message-ID: <1468578442-23552-1-git-send-email-ross.burton@intel.com> (raw)
The messaging FIFO is UTF-8, so decode the command as UTF-8 as well as the value
as otherwise "bberror" != b("bberror") and none of the messages from shell
functions are ever displayed.
Also add an else to the command parser so unhandled commands are noticed.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
bitbake/lib/bb/build.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 4f01d66..7c47680 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -389,7 +389,7 @@ exit $ret
lines = data.split(b'\0')
for line in lines:
splitval = line.split(b' ', 1)
- cmd = splitval[0]
+ cmd = splitval[0].decode("utf-8")
if len(splitval) > 1:
value = splitval[1].decode("utf-8")
else:
@@ -413,7 +413,8 @@ exit $ret
level = int(splitval[0])
value = splitval[1]
bb.debug(level, value)
-
+ else:
+ bb.warn("Unrecognised command '%s' on FIFO" % cmd)
tempdir = d.getVar('T', True)
fifopath = os.path.join(tempdir, 'fifo.%s' % os.getpid())
if os.path.exists(fifopath):
--
2.8.1
next reply other threads:[~2016-07-15 10:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-15 10:27 Ross Burton [this message]
2016-07-15 23:08 ` [PATCH] lib/bb/build.py: decode the command as UTF-8 Paul Eggleton
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1468578442-23552-1-git-send-email-ross.burton@intel.com \
--to=ross.burton@intel.com \
--cc=bitbake-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.