Kaydet (Commit) 439e5279 authored tarafından Miklos Vajna's avatar Miklos Vajna

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.
üst 252e599b
...@@ -815,8 +815,8 @@ sub replace_setup_variables ...@@ -815,8 +815,8 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } # using "680" instead of "src680" 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`; my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h- && git describe --abbrev=0`;
if (!$buildidstring) { if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
} }
else { else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment