[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - solenv/bin

Andras Timar (via logerrit) logerrit at kemper.freedesktop.org
Sun Nov 8 20:33:33 UTC 2020


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

New commits:
commit 91d0041afc2be14a70cd4a0101b09b369ce49f8f
Author:     Andras Timar <andras.timar at collabora.com>
AuthorDate: Sun Nov 8 20:33:19 2020 +0100
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Nov 8 21:33:01 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/+/105450
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index 54fe15c29852..f38722e708b8 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