scripts/bitbake: Handle the case where git isn't installed cleanly

Currently the user sees ugly errors if git isn't installed, this patch
cleans up the code to correctly handle that case.

(From OE-Core rev: aeb704fee8b4ffeaeddcdb36ae4e1d62c264ce42)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2013-05-21 10:05:48 +01:00
parent 70e5a74bce
commit d95a27b4d9
1 changed files with 5 additions and 4 deletions

View File

@ -60,7 +60,7 @@ fi
needtar="1"
needgit="1"
TARVERSION=`tar --version | head -n 1 | cut -d ' ' -f 4`
GITVERSION=`git --version | cut -d ' ' -f 3`
GITVERSION=`git --version 2> /dev/null | cut -d ' ' -f 3`
float_test() {
echo | awk 'END { exit ( !( '"$1"')); }'
}
@ -72,9 +72,10 @@ version_compare() {
# but earlier versions do not; this needs to work properly for sstate
float_test "$TARVERSION > 1.23" && needtar="0"
# Need git >= 1.7.5 for git-remote --mirror=xxx syntax
version_compare $GITVERSION ">=" 1.7.5 && needgit="0"
if [ ! -z $GITVERSION ]; then
# Need git >= 1.7.5 for git-remote --mirror=xxx syntax
version_compare $GITVERSION ">=" 1.7.5 && needgit="0"
fi
buildpseudo="1"
if [ $needpseudo = "1" ]; then