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

[Jan-Marek Glogowski]

 solenv/bin/modules/installer/globals.pm |    1 +
 solenv/bin/modules/installer/ziplist.pm |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 0a841226089679d2fed752607ce157ad0f5af330
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Wed Mar 19 17:15:10 2014 +0100

    fdo#75577: Add and use $helppackaddon variable
    
    It was removed by a previous commit, because the code used the wrong,
    non-existing variable $helppackpackaddon.
    
    Change-Id: I00ca05ee07585ffd4fbdc75f881749098e6d5329
    Reviewed-on: https://gerrit.libreoffice.org/8662
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm
index a0b92de..2076e8b 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -170,6 +170,7 @@ BEGIN
     @binarytableonlyfiles = ();
     @allscpactions = ();
     $languagepackaddon = "LanguagePack";
+    $helppackaddon = "HelpPack";
     $ooodownloadfilename = "";
     $downloadfilename = "";
     $downloadfileextension = "";
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index 18d75a9..ea4c209 100644
--- a/solenv/bin/modules/installer/ziplist.pm
+++ b/solenv/bin/modules/installer/ziplist.pm
@@ -834,7 +834,7 @@ sub add_variables_to_allvariableshashref
     }
 
     if ( $installer::globals::languagepack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::languagepackaddon; }
-    elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackpackaddon; }
+    elsif ( $installer::globals::helppack ) { $variableshashref->{'PRODUCTADDON'} = $installer::globals::helppackaddon; }
     else { $variableshashref->{'PRODUCTADDON'} = ""; }
 
     my $localbuild = $installer::globals::build;