summaryrefslogtreecommitdiffstats
path: root/lib/MDK/Common/System.pm
diff options
context:
space:
mode:
authorMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-04-12 00:22:14 +0100
committerMageia SVN-Git Migration <svn-git-migration@mageia.org>2011-04-12 00:22:14 +0100
commite2c864512f4e0643422ebd4a8af1e333b67be424 (patch)
tree5cd0058b93aa33d9efb4df42a11f5d9d107a5f9e /lib/MDK/Common/System.pm
parenta074b22aa2e9c03fe906d7a52568ae414a589b95 (diff)
downloadperl-MDK-Common-e2c864512f4e0643422ebd4a8af1e333b67be424.tar
perl-MDK-Common-e2c864512f4e0643422ebd4a8af1e333b67be424.tar.gz
perl-MDK-Common-e2c864512f4e0643422ebd4a8af1e333b67be424.tar.bz2
perl-MDK-Common-e2c864512f4e0643422ebd4a8af1e333b67be424.tar.xz
perl-MDK-Common-e2c864512f4e0643422ebd4a8af1e333b67be424.zip
Synthesized commit during git-svn import combining previous Mandriva history with Mageia.
This commit consitsts of the following subversion commits: ------------------------------------------------------------------------ r870 | blino | 2011-04-12 00:22:14 +0100 (Tue, 12 Apr 2011) | 1 line import perl-MDK-Common ------------------------------------------------------------------------
Diffstat (limited to 'lib/MDK/Common/System.pm')
-rw-r--r--lib/MDK/Common/System.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/MDK/Common/System.pm b/lib/MDK/Common/System.pm
index 845f8e0..97d069f 100644
--- a/lib/MDK/Common/System.pm
+++ b/lib/MDK/Common/System.pm
@@ -242,7 +242,9 @@ sub distrib() {
my ($real_system, $real_product) = $release =~ /(.*) release ([\d.]+)/;
my $oem_config = '/etc/sysconfig/oem';
my %oem = -f $oem_config && getVarsFromSh($oem_config);
- my $company = $oem{COMPANY} || 'Mandriva';
+ #- (blino) FIXME: merge with release functions from /usr/lib/libDrakX/common.pm (including product.id parsing)
+ my ($default_company) = split(' ', $real_system);
+ my $company = $oem{COMPANY} || $default_company || 'Unknown vendor';
my $system = $oem{SYSTEM} || $real_system;
my $product = $oem{PRODUCT} || $real_product;
(company => $company, system => $system, product => $product, real_system => $real_system, real_product => $real_product);