diff options
Diffstat (limited to 'solenv/bin/modules/installer/ziplist.pm')
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index a434163b0dd9..00de1709473b 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -644,7 +644,8 @@ sub set_manufacturer my ($allvariables) = @_; my $openofficeproductname = "OpenOffice.org"; - my $sunname = "Sun Microsystems"; + my $sunname = ""; + if ( $allvariables->{'OPENSOURCE'} && $allvariables->{'OPENSOURCE'} == 1 ) { @@ -655,6 +656,8 @@ sub set_manufacturer else { $installer::globals::isopensourceproduct = 0; + if (( $allvariables->{'DEFINEDMANUFACTURER'} ) && ( $allvariables->{'DEFINEDMANUFACTURER'} ne "" )) { $sunname = $allvariables->{'DEFINEDMANUFACTURER'}; } + else { installer::exiter::exit_program("ERROR: Property DEFINEDMANUFACTURER has to be set for this product!", "set_manufacturer"); } $installer::globals::manufacturer = $sunname; $installer::globals::longmanufacturer = $sunname . ", Inc."; } |