diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-08 21:58:21 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-08 21:58:21 +0000 |
| commit | fd0d4ea86bbdf260d057812c39fda0d0f7be5b84 (patch) | |
| tree | b1eb65ad9107127cad47871e895150399b893550 | |
| parent | ea0b71473cd1562d9dca6c2ccc5e8b41881799c0 (diff) | |
some hacks to make draw run with a tweaked setup_osl.insintegration/dev300_m98
| -rw-r--r-- | solenv/bin/modules/installer/simplepackage.pm | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm index 3fd53f889..4b8a9827e 100644 --- a/solenv/bin/modules/installer/simplepackage.pm +++ b/solenv/bin/modules/installer/simplepackage.pm @@ -437,7 +437,7 @@ sub create_package { $localtempdir = "$tempdir/$packagename"; if ( $installer::globals::helppack ) { $volume_name = "$volume_name Help Pack"; } - if ( $installer::globals::languagepack ) + if ( $installer::globals::languagepack ) { $volume_name_classic = "$volume_name_classic Language Pack"; $volume_name_classic_app = "$volume_name_classic_app Language Pack"; } diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index 868ea8e77..0f7651936 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -772,16 +772,6 @@ sub overwrite_ooovendor } ########################################################### -# Overwrite the vendor string in openoffice.lst that is defined in configure -########################################################### - -sub overwrite_ooovendor -{ - my ($variableshashref) = @_; - $variableshashref->{'OOOVENDOR'} = $ENV{'OOO_VENDOR'} , if( defined $ENV{'OOO_VENDOR'} && $ENV{'OOO_VENDOR'} ne "" ); -} - -########################################################### # Adding the lowercase variables into the variableshashref ########################################################### |