From 0a841226089679d2fed752607ce157ad0f5af330 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Wed, 19 Mar 2014 17:15:10 +0100 Subject: fdo#75577: Add and use $helppackaddon variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- solenv/bin/modules/installer/globals.pm | 1 + solenv/bin/modules/installer/ziplist.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/solenv/bin/modules/installer/globals.pm b/solenv/bin/modules/installer/globals.pm index a0b92de16539..2076e8bd7f9b 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 18d75a914ec1..ea4c20990380 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; -- cgit v1.2.3