summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-01-24 13:33:13 +0100
committerBosdonnat Cedric <cedric.bosdonnat@free.fr>2013-01-28 08:24:59 +0000
commit67fcef018003a4baa8a758bb79cad459016009bc (patch)
tree743bc0274c702a28d0a46594fc8ee1aae88a0dec
parent55ede5572e4b242f73caaf557802ff38e6d1af29 (diff)
fdo#59798: fix SDK MSI version "LOdev 4.1 SDK.0.0.alpha0"
... by adding POSTVERSIONEXTENSION after PRODUCTEXTENSION. (regression from e024a8d88dbca3a2d178ad88c069721a92156ddf) Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32 (cherry picked from commit e2d60ae0bf885a39bb392729797b0fc6ec3a5fe5) Reviewed-on: https://gerrit.libreoffice.org/1841 Reviewed-by: Andras Timar <atimar@suse.com> Tested-by: Andras Timar <atimar@suse.com> (cherry picked from commit c6a1ebfd96e0d05bd6b93d49dd3fdebc518c9328) Reviewed-on: https://gerrit.libreoffice.org/1844 Reviewed-by: Eike Rathke <erack@redhat.com> Reviewed-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr> Tested-by: Bosdonnat Cedric <cedric.bosdonnat@free.fr>
-rw-r--r--solenv/bin/modules/installer/windows/property.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index fddb6c4d7d49..20e6ad353672 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -156,13 +156,6 @@ sub get_productname_for_property_table($$)
my $version = $allvariables->{'PRODUCTVERSION'};
my $productname = $name . " " . $version;
- my $postversionextension = "";
- if ( $allvariables->{'POSTVERSIONEXTENSION'} )
- {
- $postversionextension = $allvariables->{'POSTVERSIONEXTENSION'};
- $productname = $productname . " " . $postversionextension;
- }
-
my $productextension = "";
if ( $allvariables->{'PRODUCTEXTENSION'} )
{
@@ -170,6 +163,13 @@ sub get_productname_for_property_table($$)
$productname = $productname . $productextension;
}
+ my $postversionextension = "";
+ if ( $allvariables->{'POSTVERSIONEXTENSION'} )
+ {
+ $postversionextension = $allvariables->{'POSTVERSIONEXTENSION'};
+ $productname = $productname . " " . $postversionextension;
+ }
+
if ( $installer::globals::languagepack )
{
my $langstring = get_english_language_string(); # Example: (English, German)