diff options
Diffstat (limited to 'solenv/bin/modules/installer/scriptitems.pm')
| -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 { |