[Libreoffice-commits] .: Branch 'libreoffice-4-0' - solenv/bin

[Libreoffice Gerrit user]

 solenv/bin/modules/installer/simplepackage.pm |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 23fa3a329688e15b152165710079601c921b79c9
Author: Tor Lillqvist <tml at iki.fi>
Date:   Sat Jan 19 21:05:59 2013 +0200

    Fix Mac build fallout from PRODUCTEXTENSION change
    
    PRODUCTEXTENSION used to be empty. (No idea for how long it had been
    empty.) And apparently some of the "installer" Perl code implicitly
    assumed PRODUCTEXTENSION was empty. At least, producing the langpack
    dmg for Mac started to fail when PRODUCTEXTENSION was no longer empty.
    (cherry picked from commit c7e3f88b1291c35e09d08d14f82eadf60f7063cd)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/solenv/bin/modules/installer/simplepackage.pm b/solenv/bin/modules/installer/simplepackage.pm
index 5bc319d..561b0fe 100755
--- a/solenv/bin/modules/installer/simplepackage.pm
+++ b/solenv/bin/modules/installer/simplepackage.pm
@@ -278,13 +278,11 @@ sub create_package
             $folder = $packagename;
         }
 
-        # my $volume_name = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'}; # Adding PRODUCTVERSION makes this difficult to maintain!
         my $volume_name = $allvariables->{'PRODUCTNAME'};
         my $volume_name_classic = $allvariables->{'PRODUCTNAME'} . ' ' . $allvariables->{'PRODUCTVERSION'};
         my $volume_name_classic_app = $volume_name;  # "app" should not contain version number
-        # $volume_name = $volume_name . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'}; # Adding PRODUCTEXTENSION makes this difficult to maintain!
-        $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
-        $volume_name_classic_app = $volume_name_classic_app . ' ' . $allvariables->{'PRODUCTEXTENSION'} if $allvariables->{'PRODUCTEXTENSION'};
+        $volume_name_classic = $volume_name_classic;
+        $volume_name_classic_app = $volume_name_classic_app;
         if ( $allvariables->{'DMG_VOLUMEEXTENSION'} ) {
             $volume_name = $volume_name . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};
             $volume_name_classic = $volume_name_classic . ' ' . $allvariables->{'DMG_VOLUMEEXTENSION'};