From dac52f9e80739c22ba76fbc854d980e2230907f1 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Wed, 8 Aug 2007 21:03:06 +0000 Subject: simplify code using Xconfig::proprietary::pkgs_for_Driver2 from drakx-kbd-mouse-X11 0.21 --- perl-install/install/steps.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm index f094658e8..e10c010ea 100644 --- a/perl-install/install/steps.pm +++ b/perl-install/install/steps.pm @@ -580,8 +580,8 @@ sub install_hardware_packages { require Xconfig::card; require Xconfig::proprietary; my $cards = Xconfig::card::readCardsDB("$ENV{SHARE_PATH}/ldetect-lst/Cards+"); - my @drivers = uniq(map { exists $_->{Driver2} ? Xconfig::proprietary::pkg_name_for_Driver2($_) : () } values %$cards); - push @l, map { $_, @{$o->do_pkgs->check_kernel_module_packages($_) || []} } @drivers; + my @drivers = grep { $_ } uniq(map { $_->{Driver2} } values %$cards); + push @l, map { Xconfig::proprietary::pkgs_for_Driver2($_, $o->do_pkgs) } @drivers; require network::connection; require network::thirdparty; -- cgit v1.2.1