[Libreoffice-commits] core.git: solenv/bin

Mike Kaganski (via logerrit) logerrit at kemper.freedesktop.org
Sat Sep 5 05:01:51 UTC 2020


 solenv/bin/modules/installer/windows/feature.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bb64b19e3e8942e610db2d3596d859f7c7864811
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Sep 4 19:04:43 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Sat Sep 5 07:01:12 2020 +0200

    Avoid warnings about use of uninitialized value
    
    Like these:
    
        Use of uninitialized value $feature{"Description"} in substitution (s///) at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm line 362.
        Use of uninitialized value $feature{"Title"} in concatenation (.) or string at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm line 370.
        Use of uninitialized value $feature{"Description"} in concatenation (.) or string at C:/lo/src/core/solenv/bin/modules/installer/windows/feature.pm line 370.
    
    gm_o_OGLTrans has no Title nor Description
    
    Change-Id: Ica247e071f252023e4cdec6f8ff15f0e0d3cedd5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102059
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/bin/modules/installer/windows/feature.pm b/solenv/bin/modules/installer/windows/feature.pm
index c97be4a9c98e..356220829893 100644
--- a/solenv/bin/modules/installer/windows/feature.pm
+++ b/solenv/bin/modules/installer/windows/feature.pm
@@ -357,8 +357,8 @@ sub create_feature_table
 
             $feature{'feature'} = get_feature_gid($onefeature);
             $feature{'feature_parent'} = get_feature_parent($onefeature);
-            $feature{'Title'} = $onefeature->{'Name'};
-            $feature{'Description'} = $onefeature->{'Description'};
+            $feature{'Title'} = $onefeature->{'Name'} // "";
+            $feature{'Description'} = $onefeature->{'Description'} // "";
             $feature{'Description'} =~ s/\\\"/\"/g;  # no more masquerading of '"'
             $feature{'Display'} = get_feature_display($onefeature);
             $feature{'Level'} = get_feature_level($onefeature);


More information about the Libreoffice-commits mailing list