summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2014-01-13 00:26:17 -0800
committerAndras Timar <andras.timar@collabora.com>2014-01-13 00:26:17 -0800
commit550f9ad0386660cb6d058e0e5b662b92f87378ba (patch)
tree0867a57cb73a9a6a402b442cbaccd278847322ba
parent843cc47f8b983baebb94fb4627763fbeb4be4173 (diff)
MSP patchsequence fixcp-4.1-4
Change-Id: Iaf4a6e5eb8291d78835a391894ba1b1cc675390a
-rw-r--r--solenv/bin/modules/installer/windows/msp.pm11
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 bdb33672e441..111db2beaaf7 100644
--- a/solenv/bin/modules/installer/windows/msp.pm
+++ b/solenv/bin/modules/installer/windows/msp.pm
@@ -891,19 +891,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;
}