summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2012-01-26 17:27:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-01-26 16:47:45 +0000
commit9abb0b6bbe2de65988065f78354ccf5ebde4a7ae (patch)
tree1cb5aab6ceaa6e5213dcbfc34c960150c849ade1
parent6136ac974a5e141baf346dc64186fb3ef2d27239 (diff)
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
-rw-r--r--solenv/bin/modules/installer/scriptitems.pm2
1 files changed, 1 insertions, 1 deletions
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 {