diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-06 11:04:34 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-07 14:44:25 +0000 |
| commit | 87acfdb28380c26344a79a9dc0b4b403173bdc44 (patch) | |
| tree | 4d5d39ff8d4527753b9eb50ef8d1689444664945 /meta | |
| parent | 4661f1441429952f30e19cebd93dc42ce31fd868 (diff) | |
| download | openembedded-core-87acfdb28380c26344a79a9dc0b4b403173bdc44.tar.gz openembedded-core-87acfdb28380c26344a79a9dc0b4b403173bdc44.tar.bz2 openembedded-core-87acfdb28380c26344a79a9dc0b4b403173bdc44.zip | |
kernel-yocto: Disable ANSI escape codes from git branch
'git branch' may use ANSI escape codes in its output (to provide colour)
which doesn't play well with commands expecting pure plain text, e.g.
fatal: '^[[31mmaster^[[m' is not a valid branch name.
Use the --no-color option to ensure all branch names are plain text.
Cc: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index fb8e04e704..7913dd8c00 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -196,7 +196,7 @@ do_kernel_checkout() { # If KMETA is defined, the branch must exist, but a machine branch # can be missing since it may be created later by the tools. if [ -n "${KMETA}" ]; then - git branch -a | grep -q ${KMETA} + git branch -a --no-color | grep -q ${KMETA} if [ $? -ne 0 ]; then echo "ERROR. The branch '${KMETA}' is required and was not" echo "found. Ensure that the SRC_URI points to a valid linux-yocto" @@ -214,7 +214,7 @@ do_kernel_checkout() { fi # convert any remote branches to local tracking ones - for i in `git branch -a | grep remotes | grep -v HEAD`; do + for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`; git show-ref --quiet --verify -- "refs/heads/$b" if [ $? -ne 0 ]; then |