From e024a8d88dbca3a2d178ad88c069721a92156ddf Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Fri, 18 Jan 2013 19:20:42 +0100 Subject: installer: remove SHORT_PRODUCTEXTENSION Currently PRODUCTEXTENSION does not have a value, which is unfortunate because some places such as the soffice --help output and utl::DocInfoHelper::GetGeneratorString() which creates the meta:generator for ODF files (via Setup.xcu Product/ooSetupExtension) write an incomplete version number. Since there doesn't appear to be a point in having 2 variables here, remove SHORT_ one and use PRODUCTEXTENSION consistently. Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0 --- solenv/bin/modules/installer/download.pm | 4 ++-- solenv/bin/modules/installer/ziplist.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'solenv/bin') diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 21bd62ff0b75..6d370ae6e81a 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -345,7 +345,7 @@ sub get_download_version my $version = ""; $version = $allvariables->{'PRODUCTVERSION'}; - if (( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) && ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'SHORT_PRODUCTEXTENSION'}; } + if (( $allvariables->{'PRODUCTEXTENSION'} ) && ( $allvariables->{'PRODUCTEXTENSION'} ne "" )) { $version = $version . $allvariables->{'PRODUCTEXTENSION'}; } return $version; } @@ -586,7 +586,7 @@ sub resolve_variables_in_downloadname $downloadname =~ s/\{packageversion\}/$packageversion/; my $extension = ""; - if ( $allvariables->{'SHORT_PRODUCTEXTENSION'} ) { $extension = $allvariables->{'SHORT_PRODUCTEXTENSION'}; } + if ( $allvariables->{'PRODUCTEXTENSION'} ) { $extension = $allvariables->{'PRODUCTEXTENSION'}; } $extension = lc($extension); $downloadname =~ s/\{extension\}/$extension/; diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index aa15ba02061d..06b9dd919050 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -843,9 +843,9 @@ sub add_variables_to_allvariableshashref my $lcvariable = lc($variableshashref->{'PRODUCTNAME'}); $variableshashref->{'LCPRODUCTNAME'} = $lcvariable; - if ($variableshashref->{'SHORT_PRODUCTEXTENSION'}) + if ($variableshashref->{'PRODUCTEXTENSION'}) { - $variableshashref->{'LCPRODUCTEXTENSION'} = "\-" . lc($variableshashref->{'SHORT_PRODUCTEXTENSION'}); # including the "-" ! + $variableshashref->{'LCPRODUCTEXTENSION'} = "\-" . lc($variableshashref->{'PRODUCTEXTENSION'}); # including the "-" ! } else { -- cgit