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

[Mike Kaganski (via logerrit)]

 solenv/bin/modules/installer/scriptitems.pm |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 9b8a8dc74dd352820141d2b7e5320bcda39a7814
Author:     Mike Kaganski <mike.kaganski at collabora.com>
AuthorDate: Fri Sep 4 17:19:38 2020 +0300
Commit:     Mike Kaganski <mike.kaganski at collabora.com>
CommitDate: Fri Sep 4 19:32:52 2020 +0200

    Avoid warnings about use of uninitialized value
    
    Like these:
    
        Use of uninitialized value in exists at C:/lo/src/core/solenv/bin/modules/installer/scriptitems.pm line 402.
    
    Debugging the failing values, these are:
    
    element 113
        Dir => gid_Dir_Autotext_Language
        HostName => LibreOfficeDev 7/share/autotext/qtz
        modules => gid_Module_Langpack_Basis_qtz
        specificlanguage => qtz
        Styles => (CREATE)
    
    element 512
        Dir => gid_Brand_Dir_Share_Uno_Packages
        HostName => LibreOfficeDev 7/share/uno_packages
        modules => gid_Module_Root,gid_Module_Root_Brand
        specificlanguage =>
        Styles => (CREATE)
    
    element 513
        Dir => gid_Brand_Dir_Share_Uno_Packages_Cache
        HostName => LibreOfficeDev 7/share/uno_packages/cache
        modules => gid_Module_Root,gid_Module_Root_Brand
        specificlanguage =>
        Styles => (CREATE)
    
    element 514
        Dir => gid_Brand_Dir_Share_Uno_Packages_Cache_Uno_Packages
        HostName => LibreOfficeDev 7/share/uno_packages/cache/uno_packages
        modules => gid_Module_Root
        specificlanguage =>
        Styles => (CREATE)
    
    Change-Id: I9c91e2fa9bbaab4c15e96dbbdc710141e500c482
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102053
    Tested-by: Jenkins
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/solenv/bin/modules/installer/scriptitems.pm b/solenv/bin/modules/installer/scriptitems.pm
index 81f0271dfe7f..54247d01d329 100644
--- a/solenv/bin/modules/installer/scriptitems.pm
+++ b/solenv/bin/modules/installer/scriptitems.pm
@@ -399,7 +399,8 @@ sub remove_not_required_spellcheckerlanguage_files
     for ( my $i = 0; $i <= $#{$filesarrayref}; $i++ )
     {
         my $onefile = ${$filesarrayref}[$i];
-        if ( exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
+        # FIXME: some items don't have 'gid'
+        if ( (defined $onefile->{'gid'}) && exists($installer::globals::spellcheckerfilehash{$onefile->{'gid'}}) )
         {
             $infoline = "Spellchecker selection: Removing file $onefile->{'gid'}\n";
             push( @installer::globals::logfileinfo, $infoline);