diff options
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'}; |