INTEGRATION: CWS rt07 (1.9.2); FILE MERGED

2005/04/07 09:59:02 rt 1.9.2.1: #i46826# Use print_message, print_warning, or print_error out of logger.pm instead of pure 'print' to make output more configurable.
This commit is contained in:
Jens-Heiner Rechtien 2005-04-11 08:03:59 +00:00
parent 340c646df7
commit fd1590bd9a

View file

@ -2,9 +2,9 @@
#
# $RCSfile: ziplist.pm,v $
#
# $Revision: 1.9 $
# $Revision: 1.10 $
#
# last change: $Author: rt $ $Date: 2005-04-04 10:01:24 $
# last change: $Author: hr $ $Date: 2005-04-11 09:03:59 $
#
# 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->{'OPENSOURCE'} == 1 )
if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 )
{
$installer::globals::isopensourceproduct = 1;
$installer::globals::manufacturer = $openofficeproductname;