From 9abb0b6bbe2de65988065f78354ccf5ebde4a7ae Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 26 Jan 2012 17:27:03 +0100 Subject: solenv: handle error code from ./g This avoids "Cannot find the git binary! Is git installed and is in PATH?" strings in the about dialog when building from a tarball. (cherry picked from commit 439e5279c5d334f849a6ab7b51bad1bb12f13aae) Conflicts: solenv/bin/modules/installer/scriptitems.pm --- solenv/bin/modules/installer/scriptitems.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index bb8fe55156e0..fb5c9c443372 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -816,7 +816,7 @@ sub replace_setup_variables if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680" my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`; - if (!$buildidstring) { + if ($? || !$buildidstring) { $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; } else { -- cgit v1.2.3