summaryrefslogtreecommitdiffstats
path: root/perl-install/scanner.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-02-26 18:58:45 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-02-26 18:58:45 +0000
commitea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7 (patch)
tree1f0b80d4ffdae2e5662accf94d2320b52c0ad88d /perl-install/scanner.pm
parent4e68dbc5a206cc1953e05a985efe9d3f922a4f14 (diff)
downloaddrakx-backup-do-not-use-ea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7.tar
drakx-backup-do-not-use-ea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7.tar.gz
drakx-backup-do-not-use-ea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7.tar.bz2
drakx-backup-do-not-use-ea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7.tar.xz
drakx-backup-do-not-use-ea3ae2dd510dfd6fe6a3b12c802ee4ec8e0566c7.zip
Skip Alcatel Speed Touch ADSL Modem when it is detected by "sane-find-scanner"
Diffstat (limited to 'perl-install/scanner.pm')
-rwxr-xr-xperl-install/scanner.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/scanner.pm b/perl-install/scanner.pm
index a2e68a6a5..7f843bc3e 100755
--- a/perl-install/scanner.pm
+++ b/perl-install/scanner.pm
@@ -147,6 +147,9 @@ sub detect {
# Comment line in output of "sane-find-scanner"
next;
}
+ # The Alcatel Speed Touch internet scanner is not supported by
+ # SANE
+ next if $description =~ /Alcatel.*Speed.*Touch/i;
# Extract port
$line =~ /\s+(\S+)\s*$/;
$port = $1;
@@ -190,7 +193,7 @@ sub detect {
my $searchport2 = handle_configs::searchstr($d->{port2});
foreach my $c (@configured) {
if ($c->{port} =~ /$searchport1$/ ||
- $c->{port} =~ /$searchport2$/) {
+ ($searchport2 && $c->{port} =~ /$searchport2$/)) {
$d->{configured} = 1;
last;
}
@@ -375,12 +378,8 @@ sub updateScannerDBfromSane {
s/\s+$//;
/^\;/ and next;
($cmd, $val) = /:(\S+)\s*\"([^\;]*)\"/ or next; #log::l("bad line $lineno ($_)"), next;
- if ($f =~ /microtek/) {
- #print "##### |$cmd|$val|\n";
- }
my $f = $fs->{$cmd};
$f ? $f->() : log::l("unknown line $lineno ($_)");
- #$f ? $f->() : print "##### unknown line $lineno ($_)\n";
}
$fs->{model}(); # the last one
}