From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM
Date: Fri, 14 Jun 2013 13:48:20 -0700 [thread overview]
Message-ID: <1371242900-7066-1-git-send-email-sgw@linux.intel.com> (raw)
Having a value in TERM that is not recognized by the nativesdk can cause
potential escape sequences appearing in the output stream, the can be seen
on Ubuntu with TERM=xterm-256color. Unsetting TERM allows for consistent
results in the python output.
Also, don't exit, use return, otherwise the shell exits and get no error information.
[YOCTO #4732]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
scripts/oe-buildenv-internal | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal
index 40d95b7..9be034b 100755
--- a/scripts/oe-buildenv-internal
+++ b/scripts/oe-buildenv-internal
@@ -29,6 +29,8 @@ if [ ! -z "$OECORE_SDK_VERSION" ]; then
return 1
fi
+TERM_save=$TERM
+unset TERM
# Make sure we're not using python v3.x. This check can't go into
# sanity.bbclass because bitbake's source code doesn't even pass
# parsing stage when used with python v3, so we catch it here so we
@@ -37,7 +39,7 @@ py_v3_check=`/usr/bin/env python --version 2>&1 | grep "Python 3"`
if [ "$py_v3_check" != "" ]; then
echo "Bitbake is not compatible with python v3"
echo "Please set up python v2 as your default python interpreter"
- exit 1
+ return 1
fi
# Similarly, we now have code that doesn't parse correctly with older
@@ -46,7 +48,7 @@ fi
py_v26_check=`python -c 'import sys; print sys.version_info >= (2,7,3)'`
if [ "$py_v26_check" != "True" ]; then
echo "BitBake requires Python 2.7.3 or later"
- exit 1
+ return 1
fi
if [ "x$BDIR" = "x" ]; then
@@ -107,3 +109,5 @@ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \
all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \
SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \
SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR"
+
+export TERM=$TERM_save
--
1.8.1.4
next reply other threads:[~2013-06-14 20:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-14 20:48 Saul Wold [this message]
2013-06-14 21:08 ` [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM Richard Purdie
2013-06-14 21:21 ` Saul Wold
2013-06-16 19:12 ` Otavio Salvador
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=1371242900-7066-1-git-send-email-sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@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.