diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:11:02 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2010-12-20 01:11:02 +0100 |
| commit | 70896c190c7d841caa40f9de8a853fa2aa44f7d3 (patch) | |
| tree | babb39c82d6ad8677e09de49f354c0b45b311045 /solenv/bin/modules/installer/windows/msp.pm | |
| parent | 16a9ffe76b5cb56f11aeb66c2f7d54df33871d93 (diff) | |
| parent | 2f88c156cb2c11e06df27ada25c2169fc51dc9dc (diff) | |
Merge commit 'libreoffice-3.3.0.2'
Conflicts:
configure.in
scp2/source/extensions/directory_extensions.scp
scp2/source/extensions/module_extensions.scp
scp2/source/ooo/file_ooo.scp
set_soenv.in
solenv/bin/modules/installer/download.pm
solenv/bin/modules/installer/helppack.pm
solenv/bin/modules/installer/windows/createfolder.pm
solenv/bin/modules/installer/worker.pm
solenv/bin/ooinstall
Diffstat (limited to 'solenv/bin/modules/installer/windows/msp.pm')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index c5740aab1b0e..85945a05499d 100644 --- a/solenv/bin/modules/installer/windows/msp.pm +++ b/solenv/bin/modules/installer/windows/msp.pm @@ -705,7 +705,7 @@ sub change_patchmetadata_table my $descriptionvalue = ""; my $base = $allvariables->{'PRODUCTNAME'} . " " . $allvariables->{'PRODUCTVERSION'}; - if ( $installer::globals::languagepack ) { $base = $targetproductnamevalue; } + if ( $installer::globals::languagepack || $installer::globals::helppack ) { $base = $targetproductnamevalue; } my $windowspatchlevel = 0; if ( $allvariables->{'WINDOWSPATCHLEVEL'} ) { $windowspatchlevel = $allvariables->{'WINDOWSPATCHLEVEL'}; } @@ -984,6 +984,7 @@ sub correct_patch my $localproduct = $installer::globals::product; if ( $installer::globals::languagepack ) { $localproduct = $localproduct . "LanguagePack"; } + elsif ( $installer::globals::helppack ) { $localproduct = $localproduct . "HelpPack"; } if ( $product eq $localproduct ) { $product_is_good = 1; } @@ -1207,6 +1208,7 @@ sub create_msp_patch my $pcpfilename = $allvariables->{'PCPFILENAME'}; if ( $installer::globals::languagepack ) { $pcpfilename =~ s/.pcp\s*$/languagepack.pcp/; } + elsif ( $installer::globals::helppack ) { $pcpfilename =~ s/.pcp\s*$/helppack.pcp/; } # Searching the pcp file in the include pathes my $fullpcpfilenameref = installer::scriptitems::get_sourcepath_from_filename_and_includepath(\$pcpfilename, $includepatharrayref, 1); @@ -1255,7 +1257,7 @@ sub create_msp_patch installer::systemactions::copy_complete_directory($oldinstallationsetpath, $mspdir); # Copying additional patches into the installation set, if required - if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack )) + if (( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ) && ( $allvariables->{'ADDITIONALREQUIREDPATCHES'} ne "" ) && ( ! $installer::globals::languagepack ) && ( ! $installer::globals::helppack )) { my $filename = $allvariables->{'ADDITIONALREQUIREDPATCHES'}; |