[Libreoffice-commits] .: solenv/bin

Thorsten Behrens thorsten at kemper.freedesktop.org
Wed Dec 14 01:45:04 PST 2011


 solenv/bin/modules/installer/scriptitems.pm |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05d08f187a0a7211e3fed85ee0b5d2b61abf47f8
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Dec 14 10:44:01 2011 +0100

    Add latest tag name to buildid string.

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index bb8fe55..5a4dbb3 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -815,7 +815,7 @@ 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-`;
+    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 . ")";
     }


More information about the Libreoffice-commits mailing list