diff options
| author | Andras Timar <atimar@suse.com> | 2011-12-05 18:29:16 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-12-05 18:29:16 +0100 |
| commit | bee2841519d15d8df1520ef3052e3a8da19eac1b (patch) | |
| tree | 1f0e8a38f14b10728466b1ca32a1d772c503f06d /solenv | |
| parent | 83560ad42b83473913482e5569b25a1276d80da6 (diff) | |
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.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/bin/modules/installer/ziplist.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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'}; } |