[Libreoffice-commits] .: Branch 'integration/dev300_m98' - solenv/bin

[Michael Meeks]

 solenv/bin/modules/installer/simplepackage.pm |    2 +-
 solenv/bin/modules/installer/ziplist.pm       |   10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit fd0d4ea86bbdf260d057812c39fda0d0f7be5b84
Author: Michael Meeks <michael.meeks at novell.com>
Date:   Tue Mar 8 21:58:21 2011 +0000

    some hacks to make draw run with a tweaked setup_osl.ins

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 3fd53f8..4b8a982 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 868ea8e..0f76519 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
 ###########################################################