From c7f7e91919ee72b885d5b3253c608393279945ae Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 2 Jun 2005 02:08:06 +0000
Subject: create detect_devices::probe_name() &
 detect_devices::probe_unique_name() and use them

---
 perl-install/install_any.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_any.pm')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index a44a98685..70ab8285f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -768,7 +768,7 @@ sub rpmsrate_always_flags {
 
     my $rpmsrate_flags_chosen = {};
     $rpmsrate_flags_chosen->{uc($_)} = 1 foreach grep { modules::probe_category("multimedia/$_") } modules::sub_categories('multimedia');
-    $rpmsrate_flags_chosen->{uc($_)} = 1 foreach map { $_->{driver} =~ /Flag:(.*)/ } detect_devices::probeall();
+    $rpmsrate_flags_chosen->{uc($_)} = 1 foreach detect_devices::probe_name('Flag');
     $rpmsrate_flags_chosen->{DOCS} = !$o->{excludedocs};
     $rpmsrate_flags_chosen->{UTF8} = $o->{locale}{utf8};
     $rpmsrate_flags_chosen->{BURNER} = 1 if detect_devices::burners();
@@ -814,7 +814,7 @@ sub default_packages {
     push @l, "mdadm" if !is_empty_array_ref($o->{all_hds}{raids});
     push @l, "lvm2" if !is_empty_array_ref($o->{all_hds}{lvms});
     push @l, "alsa", "alsa-utils" if any { $o->{modules_conf}->get_alias("sound-slot-$_") =~ /^snd-/ } 0 .. 4;
-    push @l, map { if_($_->{driver} =~ /^Pkg:(.*)/, $1) } detect_devices::probeall();
+    push @l, detect_devices::probe_name('Pkg');
 
     my $dmi_BIOS = detect_devices::dmidecode_category('BIOS');
     my $dmi_Base_Board = detect_devices::dmidecode_category('Base Board');
-- 
cgit v1.2.1