summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-02-15 20:18:33 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-02-15 20:18:33 +0000
commit62b9afed86ddab27991d58d032963ba263b3669f (patch)
tree82ce398938d64a37992fcc79dc08eb52ec6d74c1
parent2a2d1a22f5cf880341b18a1bd0ddd43ca2d611ea (diff)
downloaddrakx-62b9afed86ddab27991d58d032963ba263b3669f.tar
drakx-62b9afed86ddab27991d58d032963ba263b3669f.tar.gz
drakx-62b9afed86ddab27991d58d032963ba263b3669f.tar.bz2
drakx-62b9afed86ddab27991d58d032963ba263b3669f.tar.xz
drakx-62b9afed86ddab27991d58d032963ba263b3669f.zip
Fixed bug in setting up multiple scanners at once.
-rwxr-xr-xperl-install/standalone/scannerdrake18
1 files changed, 10 insertions, 8 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 2901644c0..eb352bc0d 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -76,6 +76,7 @@ sub removeverticalbar {
sub auto {
my $changed = 0;
foreach (@f) {
+ my $c = 0;
if (member($_->{val}{DESCRIPTION}, keys %$scanner::scannerDB)) {
my $name = $_->{val}{DESCRIPTION};
$name =~ s/\s$//; # some HP entries have a trailing space, i will correct usbtable asap
@@ -84,23 +85,24 @@ sub auto {
next;
}
if ($in->ask_yesorno('Scannerdrake',N("%s found on %s, configure it automatically?",removeverticalbar($name),$_->{port}),1)) {
- $changed ||= (tryConfScanner($name, $_->{port},
- $_->{val}{vendor},
- $_->{val}{id}) or
- manual($_->{port}, $_->{val}{vendor},
- $_->{val}{id}, $name));
+ $c = (tryConfScanner($name, $_->{port},
+ $_->{val}{vendor},
+ $_->{val}{id}) or
+ manual($_->{port}, $_->{val}{vendor},
+ $_->{val}{id}, $name));
} else {
- $changed ||= manual($_->{port}, $_->{val}{vendor},
- $_->{val}{id}, $name);
+ $c = manual($_->{port}, $_->{val}{vendor},
+ $_->{val}{id}, $name);
}
} else {
$in->ask_yesorno('Scannerdrake',
N("%s is not in the scanner database, configure it manually?",
removeverticalbar($_->{val}{DESCRIPTION})),1)
- and ($changed ||=
+ and ($c =
manual($_->{port}, $_->{val}{vendor}, $_->{val}{id},
$_->{val}{DESCRIPTION}));
}
+ $changed ||= $c;
}
return $changed;
}