diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 09:45:57 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 09:45:57 +0000 |
| commit | 56744b2bc1d0411378e06f7e30ae7d1534cc5def (patch) | |
| tree | 3928d8113ef1a95d90671d5e3a5f3b943ab6f832 /solenv/bin/modules/installer/languagepack.pm | |
| parent | 2273e62559a129a34f5df6da33eb6e871f85ac67 (diff) | |
INTEGRATION: CWS nativefixer3 (1.4.38); FILE MERGED
2005/01/19 15:47:14 is 1.4.38.2: #i40375# fixing typo
2005/01/18 15:42:01 is 1.4.38.1: #i36837# language packs without shell scripts using DONT_REMOVE_PACKAGE
Diffstat (limited to 'solenv/bin/modules/installer/languagepack.pm')
| -rw-r--r-- | solenv/bin/modules/installer/languagepack.pm | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/solenv/bin/modules/installer/languagepack.pm b/solenv/bin/modules/installer/languagepack.pm index 3a7d08b4f77c..f77b3be5a3f7 100644 --- a/solenv/bin/modules/installer/languagepack.pm +++ b/solenv/bin/modules/installer/languagepack.pm @@ -111,9 +111,9 @@ sub select_language_items # preparing different modules for Windows Installer language packs if ( $installer::globals::iswindowsbuild ) { $oneitem->{'modules'} = "gid_Module_Langpack_" . $specificlanguage; } - if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature)) # DDD + if (! installer::existence::exists_in_array($oneitem->{'modules'}, \@installer::globals::languagepackfeature)) { - push(@installer::globals::languagepackfeature, $oneitem->{'modules'}); # Collecting all language pack feature # DDD + push(@installer::globals::languagepackfeature, $oneitem->{'modules'}); # Collecting all language pack feature } push(@itemsarray, $oneitem); @@ -371,11 +371,18 @@ sub remove_package { my ( $installdir, $packagename ) = @_; - my $longpackagename = $installdir . $installer::globals::separator . $packagename; - unlink $longpackagename; + my $remove_package = 1; - my $infoline = "Removing package: $longpackagename \n"; - push( @installer::globals::logfileinfo, $infoline); + if ( $ENV{'DONT_REMOVE_PACKAGE'} ) { $remove_package = 0; } + + if ( $remove_package ) + { + my $longpackagename = $installdir . $installer::globals::separator . $packagename; + unlink $longpackagename; + + my $infoline = "Removing package: $longpackagename \n"; + push( @installer::globals::logfileinfo, $infoline); + } } #################################################### |