INTEGRATION: CWS c08v001 (1.28.68); FILE MERGED

2005/12/20 14:40:55 is 1.28.68.1: #129362# new c08office, msi productversion < 256
This commit is contained in:
Jens-Heiner Rechtien 2006-01-24 14:15:33 +00:00
parent fe2d283fb0
commit 09997a0803

View file

@ -4,9 +4,9 @@
#
# $RCSfile: msiglobal.pm,v $
#
# $Revision: 1.30 $
# $Revision: 1.31 $
#
# last change: $Author: kz $ $Date: 2006-01-06 11:31:59 $
# last change: $Author: hr $ $Date: 2006-01-24 15:15:33 $
#
# The Contents of this file are made available subject to
# the terms of GNU Lesser General Public License Version 2.1.
@ -1498,6 +1498,8 @@ sub set_msiproductversion
my $productversion = $allvariables->{'PRODUCTVERSION'};
if (( $productversion =~ /^\s*\d+\s*$/ ) && ( $productversion > 255 )) { $productversion = $productversion%256; }
if ( $productversion =~ /^\s*(\d+)\.(\d+)\.(\d+)\s*$/ )
{
$productversion = $1 . "\." . $2 . $3 . "\." . $installer::globals::buildid;