INTEGRATION: CWS nativefixer5 (1.7.54); FILE MERGED
2005/03/07 10:14:36 is 1.7.54.2: #i44315# opensource variable 2005/03/04 17:52:36 is 1.7.54.1: #119981# same variable in packagelist and java xml file
This commit is contained in:
parent
e0f6c3f671
commit
eaec0cfa91
1 changed files with 3 additions and 3 deletions
|
@ -2,9 +2,9 @@
|
|||
#
|
||||
# $RCSfile: ziplist.pm,v $
|
||||
#
|
||||
# $Revision: 1.8 $
|
||||
# $Revision: 1.9 $
|
||||
#
|
||||
# last change: $Author: rt $ $Date: 2005-03-29 15:36:55 $
|
||||
# last change: $Author: rt $ $Date: 2005-04-04 10:01:24 $
|
||||
#
|
||||
# The Contents of this file are made available subject to the terms of
|
||||
# either of the following licenses
|
||||
|
@ -668,7 +668,7 @@ sub set_manufacturer
|
|||
my $openofficeproductname = "OpenOffice.org";
|
||||
my $sunname = "Sun Microsystems";
|
||||
|
||||
if ( $allvariables->{'PRODUCTNAME'} eq $openofficeproductname )
|
||||
if ( $allvariables->{'OPENSOURCE'} == 1 )
|
||||
{
|
||||
$installer::globals::isopensourceproduct = 1;
|
||||
$installer::globals::manufacturer = $openofficeproductname;
|
||||
|
|
Loading…
Reference in a new issue