diff options
| author | Petr Mladek <pmladek@suse.cz> | 2012-02-09 17:25:41 +0100 |
|---|---|---|
| committer | Petr Mladek <pmladek@suse.cz> | 2012-02-09 17:33:09 +0100 |
| commit | ef09cbf45347f5f1ea34f35acedeea5aa3a7f6f6 (patch) | |
| tree | e37da56d79d2fd682f73d91bbac6175dbcc3a31d /solenv | |
| parent | 56dbf827aac92cbee5fa4e609c2a102faaac5860 (diff) | |
another improvement of the about dialog
* put back "supplied by %OOOVENDOR" instead of "developed by %OOOVENDOR"
* remove "LibreOffice is" from the copyright line. It has affect only when
the product is called "LibreOffice"
* center version and buildid line
* remove the confusing branch-point from buildid; it is not longer necessary
when we have the version suffix, e.g. beta1+
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/scriptitems.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm index 23e94d75e0c9..4614c3f9a28f 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- && git describe --abbrev=0`; + my $buildidstring = join( '-', split( ' ', `$ENV{'SRC_ROOT'}/g -s log -n 1 --pretty=format:"%h "` )); if ($? || !$buildidstring) { $buildidstring = $localbuild . $localminor . "(Build:" . $installer::globals::buildid . ")"; } |