diff options
| author | Andras Timar <andras.timar@collabora.com> | 2014-01-13 00:26:17 -0800 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2014-08-25 03:13:56 -0500 |
| commit | 196196531d22bf9a0142133d9ea16ae0b5d5b6fe (patch) | |
| tree | 13310d32adc171bd1ea526fa7c59bd51a1dbfb22 /solenv | |
| parent | 152a2b48bfb93d9da3bcf654a073ee0fedf56a30 (diff) | |
MSP patchsequence fix
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
(cherry picked from commit f74a6338b3897df49f3041e7ce33453eaba9e2e5)
Reviewed-on: https://gerrit.libreoffice.org/11094
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/windows/msp.pm | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/solenv/bin/modules/installer/windows/msp.pm b/solenv/bin/modules/installer/windows/msp.pm index 01052fca99cc..1bbeea8d20cb 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; } |