diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2012-01-26 17:27:03 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@frugalware.org> | 2012-01-26 17:34:46 +0100 |
| commit | 439e5279c5d334f849a6ab7b51bad1bb12f13aae (patch) | |
| tree | d802589a01ebd9591f2f5ff6613259488ece1b1b | |
| parent | 252e599b22f08a8138b78e4215c33a86f5889fef (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.
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index a8963a4f8126..905b37e844db 100644 --- a/solenv/bin/modules/installer/scriptitems.pm +++ b/solenv/bin/modules/installer/scriptitems.pm @@ -815,8 +815,8 @@ 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- ; git describe --abbrev=0`; - if (!$buildidstring) { + my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h- && git describe --abbrev=0`; + if ($? || !$buildidstring) { $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; } else { |