From bee2841519d15d8df1520ef3052e3a8da19eac1b Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Mon, 5 Dec 2011 18:29:16 +0100 Subject: Use OOO_VENDOR as Packager whenever it is defined It is passed by the --with-vendor configure switch and it is visible on Control Panel in Windows. In official builds We want TDF there, not the username of the builder. --- solenv/bin/modules/installer/ziplist.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'solenv') diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm index d205a10dc896..c078155c3f7b 100644 --- a/solenv/bin/modules/installer/ziplist.pm +++ b/solenv/bin/modules/installer/ziplist.pm @@ -638,11 +638,11 @@ sub set_manufacturer { $manufacturer = $ENV{'OOO_VENDOR'}; } - if( defined $ENV{'USERNAME'} && $ENV{'USERNAME'} ne "" ) + elsif( defined $ENV{'USERNAME'} && $ENV{'USERNAME'} ne "" ) { $manufacturer = $ENV{'USERNAME'}; } - if( defined $ENV{'USER'} && $ENV{'USER'} ne "" ) + elsif( defined $ENV{'USER'} && $ENV{'USER'} ne "" ) { $manufacturer = $ENV{'USER'}; } -- cgit