[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/windows/msp.pm |   11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

New commits:
commit 196196531d22bf9a0142133d9ea16ae0b5d5b6fe
Author: Andras Timar <andras.timar at collabora.com>
Date:   Mon Jan 13 00:26:17 2014 -0800

    MSP patchsequence fix
    
    Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
    (cherry picked from commit f74a6338b3897df49f3041e7ce33453eaba9e2e5)
    Reviewed-on: https://gerrit.libreoffice.org/11094
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm
index 01052fc..1bbeea8 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -877,19 +877,14 @@ sub get_patchsequence
 
     my $packageversion = $allvariables->{'PACKAGEVERSION'};
 
-    if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
+    if ( $packageversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\.(\d+)\s*$/ )
     {
         my $major = $1;
         my $minor = $2;
         my $micro = $3;
-        my $concat = 100 * $minor + $micro;
-        $packageversion = $major . "\." . $concat;
+        my $patch = $4;
+        $patchsequence = $major . "\." . $minor . "\." . $micro . "\." . $patch;
     }
-    my $vendornumber = 0;
-    if ( $allvariables->{'VENDORPATCHVERSION'} ) { $vendornumber = $allvariables->{'VENDORPATCHVERSION'}; }
-    $patchsequence = $packageversion . "\." . $installer::globals::buildid . "\." . $vendornumber;
-
-    if ( $allvariables->{'PATCHSEQUENCE'} ) { $patchsequence = $allvariables->{'PATCHSEQUENCE'}; }
 
     return $patchsequence;
 }