summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-28 13:10:21 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-28 13:10:21 +0000
commitce077841fee2fe995ccada11ef75604781c3c3d5 (patch)
treecedf00e8ddc5603ec2acb4eea727acad1badbcf9 /perl-install
parentecad565c186903ab044ec7a264cc1fb070ab8a24 (diff)
downloaddrakx-ce077841fee2fe995ccada11ef75604781c3c3d5.tar
drakx-ce077841fee2fe995ccada11ef75604781c3c3d5.tar.gz
drakx-ce077841fee2fe995ccada11ef75604781c3c3d5.tar.bz2
drakx-ce077841fee2fe995ccada11ef75604781c3c3d5.tar.xz
drakx-ce077841fee2fe995ccada11ef75604781c3c3d5.zip
(detect) do not reject scanners handled by 'usbcore' driver (eg: "KODAK|i1320 SCANNER")
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/scanner.pm2
2 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 24c44f14e..19c6b9803 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- scannerdrake:
+ o do not reject scanners handled by 'usbcore' driver
+
Version 12.32 - 23 April 2009
- don't set umask=0 by default on windows partitions in 'secure' level.
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index 6fa73b18e..81b9ab3c8 100644
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -373,7 +373,7 @@ sub detect {
@res = grep { ! $_->{configured} } @res;
}
# blacklist device that have a driver b/c of buggy sane-find-scanner:
- return grep { member($_->{val}{driver}, qw(scanner unknown)) } @res;
+ return grep { member($_->{val}{driver}, qw(scanner unknown usbcore)) } @res;
}
sub resolve_symlinks {