From e2c864512f4e0643422ebd4a8af1e333b67be424 Mon Sep 17 00:00:00 2001 From: Mageia SVN-Git Migration Date: Tue, 12 Apr 2011 00:22:14 +0100 Subject: 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 ------------------------------------------------------------------------ --- Makefile.PL | 0 lib/MDK/Common.pm.pl | 0 lib/MDK/Common/System.pm | 4 +++- 3 files changed, 3 insertions(+), 1 deletion(-) mode change 100644 => 100755 Makefile.PL mode change 100644 => 100755 lib/MDK/Common.pm.pl diff --git a/Makefile.PL b/Makefile.PL old mode 100644 new mode 100755 diff --git a/lib/MDK/Common.pm.pl b/lib/MDK/Common.pm.pl old mode 100644 new mode 100755 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); -- cgit v1.2.1