summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-06-14 16:48:21 +0000
committerThierry Vignaud <tv@mandriva.org>2007-06-14 16:48:21 +0000
commit5f7906fcd8f57e872b2f1853de22385aa87b1cff (patch)
tree91bc9633f2a5bcb0fae752685b14abc6feffe128 /perl-install
parent0c0dcba11f0b6ddf968f1689a7a08176075340da (diff)
downloaddrakx-backup-do-not-use-5f7906fcd8f57e872b2f1853de22385aa87b1cff.tar
drakx-backup-do-not-use-5f7906fcd8f57e872b2f1853de22385aa87b1cff.tar.gz
drakx-backup-do-not-use-5f7906fcd8f57e872b2f1853de22385aa87b1cff.tar.bz2
drakx-backup-do-not-use-5f7906fcd8f57e872b2f1853de22385aa87b1cff.tar.xz
drakx-backup-do-not-use-5f7906fcd8f57e872b2f1853de22385aa87b1cff.zip
stop scannerdrake from fooling us about scanners and from leading us to display
twice the same device (#31182)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/harddrake/data.pm3
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 7d3d38eec..36943c60b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- harddrake UI:
+ o stop scannerdrake from fooling us about scanners and from leading
+ us to display twice the same device (#31182)
+
Version 10.4.136 - 12 June 2007, by Thierry Vignaud
- diskdrake
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 742efe0ab..76a0465fd 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -523,7 +523,8 @@ our @tree =
icon => "scanner.png",
configurator => "$sbindir/scannerdrake",
detector => sub {
- require scanner; f(scanner::detect()) },
+ require scanner; f(map { $_->{drakx_device} } f(scanner::detect()));
+ },
checked_on_boot => 0,
},