[Libreoffice-commits] .: solenv/bin

[Caolán McNamara]

 solenv/bin/modules/installer/scriptitems.pm |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 6c621b61ba1b4f6e1f5491cb47f67196510f241d
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jun 28 13:01:29 2011 +0100

    use g log for buildid, modify this if we unsplit repos or change vcs

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 346a039..f78980c 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -802,7 +802,10 @@ sub replace_setup_variables
     
     if ( $localbuild =~ /^\s*(\w+?)(\d+)\s*$/ ) { $localbuild = $2; }	# using "680" instead of "src680"
     
-    my $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
+    my $buildidstring = `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:%h-`;
+    if (!$buildidstring) {
+        $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")";
+    }
 
     # the environment variable CWS_WORK_STAMP is set only in CWS
     if ( $ENV{'CWS_WORK_STAMP'} ) { $buildidstring = $buildidstring . "\[CWS\:" . $ENV{'CWS_WORK_STAMP'} . "\]"; }