diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-28 13:01:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-28 13:32:49 +0100 |
| commit | 0953ccda128c17dc714d064d46a90f8ab08b6cf2 (patch) | |
| tree | 1b75ddd3685081a8dd57e51f0b8220085d29366d /solenv/bin | |
| parent | e0010764dbacfea3fb4283c33cb3cf477af189cf (diff) | |
use g log for buildid, modify this if we unsplit repos or change vcs
Diffstat (limited to 'solenv/bin')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index f6b3909a53a0..ed1b6bc5964e 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'} . "\]"; } |