diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-06 20:29:40 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2002-08-06 20:29:40 +0000 |
| commit | f9640e4952073e66f428c1fe3691c435c1e4bb63 (patch) | |
| tree | e5d97ffffdd70547f8a7ca890b181f07827e271f | |
| parent | 6e3f96d8e80aaa77c89aca739e9ce65e2f362014 (diff) | |
| download | drakx-f9640e4952073e66f428c1fe3691c435c1e4bb63.tar drakx-f9640e4952073e66f428c1fe3691c435c1e4bb63.tar.gz drakx-f9640e4952073e66f428c1fe3691c435c1e4bb63.tar.bz2 drakx-f9640e4952073e66f428c1fe3691c435c1e4bb63.tar.xz drakx-f9640e4952073e66f428c1fe3691c435c1e4bb63.zip | |
- dont detect undef devices
| -rw-r--r-- | perl-install/harddrake/data.pm | 4 | ||||
| -rwxr-xr-x | perl-install/scanner.pm | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index 6f6c6c4bb..285585836 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -52,8 +52,8 @@ our @tree = # ["","FDDI cards", "Ethernetcard.png", "", \&detect_devices::getNet], ["MODEM","Modem", "modem.png", "", sub { require network::modem; my $modem; - modem_detect_backend($modem); - $modem->{device} ?$modem : {}; + network::modem::modem_detect_backend($modem); + grep {$modem->{device} } @{ $modem}; } ], # ["","Isdn", "", "", \&detect_devices::getNet] diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm index 1bc381c9d..a820bd41d 100755 --- a/perl-install/scanner.pm +++ b/perl-install/scanner.pm @@ -65,7 +65,7 @@ sub detect { }}; ++$i; } - foreach ({$_->{media_type} =~ /scanner/ } detect_devices::getSCSI()) { + foreach (grep {$_->{media_type} =~ /scanner/ } detect_devices::getSCSI()) { push @res, { port => "/dev/usb/scanner$i", val => { DESCRIPTION => $_->{info} }, }; |