From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mail.openembedded.org (Postfix) with ESMTP id 0E80E6A4AC for ; Fri, 14 Jun 2013 20:48:24 +0000 (UTC) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 14 Jun 2013 13:46:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,868,1363158000"; d="scan'208";a="329672916" Received: from unknown (HELO swold-linux.bigsur.com) ([10.255.12.161]) by orsmga001.jf.intel.com with ESMTP; 14 Jun 2013 13:48:20 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Fri, 14 Jun 2013 13:48:20 -0700 Message-Id: <1371242900-7066-1-git-send-email-sgw@linux.intel.com> X-Mailer: git-send-email 1.8.1.4 Subject: [PATCH] oe-buildenv-internal: Preserve/Unset and Restore TERM X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Jun 2013 20:48:24 -0000 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 --- 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