[PATCH] Change in core[libreoffice-4-0-0]: fdo#59798: fix SDK MSI version "LOdev 4.1 SDK.0.0.alpha0"
Michael Stahl (via Code Review)
gerrit at gerrit.libreoffice.org
Thu Jan 24 05:36:46 PST 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/1844
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/44/1844/1
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 at suse.com>
Tested-by: Andras Timar <atimar at suse.com>
(cherry picked from commit c6a1ebfd96e0d05bd6b93d49dd3fdebc518c9328)
---
M solenv/bin/modules/installer/windows/property.pm
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index fddb6c4..20e6ad3 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -156,13 +156,6 @@
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 @@
$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)
--
To view, visit https://gerrit.libreoffice.org/1844
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie130dd5be08247ae9202f98cd58a6922fed27f32
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0-0
Gerrit-Owner: Michael Stahl <mstahl at redhat.com>
Gerrit-Reviewer: Andras Timar <atimar at suse.com>
More information about the LibreOffice
mailing list