summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-18 19:20:42 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-01-21 09:22:32 +0000
commit6d779eb1c65b0ce73b1a275dc4534387b97bc927 (patch)
treedb6353a939a91837843b1bf1ceffe7e7aa6457e9 /solenv
parent24138666b218b53dd88b84e092a5dbe14d2b84f9 (diff)
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. (cherry picked from commit e024a8d88dbca3a2d178ad88c069721a92156ddf) Conflicts: instsetoo_native/util/openoffice.lst Change-Id: I5aac25bcedd785a098cba612643ea68fe19c77f0 Reviewed-on: https://gerrit.libreoffice.org/1762 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'solenv')
-rw-r--r--solenv/bin/modules/installer/download.pm4
-rw-r--r--solenv/bin/modules/installer/ziplist.pm4
2 files changed, 4 insertions, 4 deletions
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 c9ba2388ae92..c052e722f8bb 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
{