solenv/bin/modules/installer/scriptitems.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9a4f81c333f23462f4fa462d8fba539b0b10a9a8
Author: Lior Kaplan <kaplanl...@gmail.com>
Date: Sun Oct 28 01:44:34 2012 +0200
./g doesn't support -s option or log command any more, use git directly
Change-Id: Icb8fa341fe76abb03ba59cbc57e8b54dbb9acbec
Reviewed-on: https://gerrit.libreoffice.org/935
Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com>
Tested-by: Norbert Thiebaud <nthieb...@gmail.com>
diff --git a/solenv/bin/modules/installer/scriptitems.pm
b/solenv/bin/modules/installer/scriptitems.pm
index 9ce5bd6..15fbdb2 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -702,7 +702,7 @@ sub replace_setup_variables
if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; } #
using "680" instead of "src680"
- my $buildidstring = join( '-', split( ' ', `$ENV{'SRC_ROOT'}/g -s log -n 1
--pretty=format:"%h "` ));
+ my $buildidstring = join( '-', split( ' ', `git log -n 1
--pretty=format:"%h "` ));
if ($? || !$buildidstring) {
$buildidstring = $localbuild . $localminor . "(Build:" .
$installer::globals::buildid . ")";
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
