mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solenv: handle error code from ./g

Browse Source 
This avoids "Cannot find the git binary! Is git installed and is in
PATH?" strings in the about dialog when building from a tarball.
This commit is contained in:
Miklos Vajna
2012-01-26 17:27:03 +01:00
parent 252e599b22
commit 439e5279c5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solenv/bin/modules/installer/scriptitems.pm
View File

@@ -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 {