diff options
| author | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-04-12 00:22:14 +0100 |
|---|---|---|
| committer | Mageia SVN-Git Migration <svn-git-migration@mageia.org> | 2011-04-12 00:22:14 +0100 |
| commit | e2c864512f4e0643422ebd4a8af1e333b67be424 (patch) | |
| tree | 5cd0058b93aa33d9efb4df42a11f5d9d107a5f9e | |
| parent | a074b22aa2e9c03fe906d7a52568ae414a589b95 (diff) | |
| download | perl-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
------------------------------------------------------------------------
| -rwxr-xr-x[-rw-r--r--] | Makefile.PL | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | lib/MDK/Common.pm.pl | 0 | ||||
| -rw-r--r-- | lib/MDK/Common/System.pm | 4 |
3 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.PL b/Makefile.PL index 95362f4..95362f4 100644..100755 --- a/Makefile.PL +++ b/Makefile.PL diff --git a/lib/MDK/Common.pm.pl b/lib/MDK/Common.pm.pl index 7a61a60..7a61a60 100644..100755 --- a/lib/MDK/Common.pm.pl +++ b/lib/MDK/Common.pm.pl 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); |