[Libreoffice-commits] .: solenv/bin

[Andras Timar]

 solenv/bin/modules/installer/ziplist.pm |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit bee2841519d15d8df1520ef3052e3a8da19eac1b
Author: Andras Timar <atimar at suse.com>
Date:   Mon Dec 5 18:29:16 2011 +0100

    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.

diff --git a/solenv/bin/modules/installer/ziplist.pm b/solenv/bin/modules/installer/ziplist.pm
index d205a10..c078155 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'};
     }