[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - solenv/bin

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Tue Dec 15 12:29:02 UTC 2020


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

New commits:
commit 7cb741a86a71481d956296f1d51b5a7543769d26
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Nov 8 20:33:19 2020 +0100
Commit:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
CommitDate: Tue Dec 15 13:28:31 2020 +0100

    remove extra space in version number in rpm/deb package info
    
    e.g. Instead of "Base module for LibreOffice 7.0 .3.1" we will get
    "Base module for LibreOffice 7.0.3.1".
    
    Change-Id: I9ce56b33f835a9527f777cfb9c0e466232e6f24f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105449
    Tested-by: Jenkins
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    (cherry picked from commit cc8e19c73714c199fd2efdc0fefe3e750e8c14a8)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107700
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 6da8ea0a4b00..7a1f5fd94c52 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -276,7 +276,7 @@ sub create_epm_header
 
     my $productnamestring = $onepackage->{'description'};
     installer::packagelist::resolve_packagevariables(\$productnamestring, $variableshashref, 0);
-    if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = $productnamestring . " " . $variableshashref->{'PRODUCTEXTENSION'}; }
+    if ( $variableshashref->{'PRODUCTEXTENSION'} ) { $productnamestring = $productnamestring . $variableshashref->{'PRODUCTEXTENSION'}; }
 
     $line = "%product" . " " . $productnamestring . "\n";
     push(@epmheader, $line);


More information about the Libreoffice-commits mailing list