summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-10 05:49:42 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-10 05:49:42 +0000
commit048fca6fe0755010660f89ec48c6268e97dff623 (patch)
tree46ad2286e58d7c20b074c164f417118691d6e2ad /perl-install
parent94e2d99aa97fa933a4d59c99e152440927258d66 (diff)
downloaddrakx-048fca6fe0755010660f89ec48c6268e97dff623.tar
drakx-048fca6fe0755010660f89ec48c6268e97dff623.tar.gz
drakx-048fca6fe0755010660f89ec48c6268e97dff623.tar.bz2
drakx-048fca6fe0755010660f89ec48c6268e97dff623.tar.xz
drakx-048fca6fe0755010660f89ec48c6268e97dff623.zip
harddrake: prevent detecting some soft modems as scanners (mga#2753)
as usual sane-find-scanner is reporting wrongly too many devices, so we must filter them Here, let's filter harder soft modems
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 636e4f572..98caa0fcd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- prevent net_applet to crash on notifications without icons (mga#2876)
+- harddrake: prevent detecting some soft modems as scanners (mga#2753)
Version 13.71 - 04 December 2011
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 9cfebe7fb..d0d604599 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -410,7 +410,7 @@ our @tree =
string => N("Modem"),
icon => "modem.png",
configurator => "$sbindir/drakconnect",
- detector => sub { f(detect_devices::getModem($modules_conf)) },
+ detector => sub { f(detect_devices::getModem($modules_conf)), f(grep { $_->{description} =~ /SoftModem/ } @devices) },
# we do not check these b/c this need user interaction (auth, ...):
checked_on_boot => 0,
},