summaryrefslogtreecommitdiffstats
path: root/perl-install/standalone
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-02-27 15:17:42 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-02-27 15:17:42 +0000
commit242444e6f0d888e16d979a859fd4e13c468abfe4 (patch)
tree1a9056ca05cd3d3c76522d87b584785e58f785f6 /perl-install/standalone
parentfc94699af7a658575bd64ce2813e62fabec21197 (diff)
downloaddrakx-backup-do-not-use-242444e6f0d888e16d979a859fd4e13c468abfe4.tar
drakx-backup-do-not-use-242444e6f0d888e16d979a859fd4e13c468abfe4.tar.gz
drakx-backup-do-not-use-242444e6f0d888e16d979a859fd4e13c468abfe4.tar.bz2
drakx-backup-do-not-use-242444e6f0d888e16d979a859fd4e13c468abfe4.tar.xz
drakx-backup-do-not-use-242444e6f0d888e16d979a859fd4e13c468abfe4.zip
Do not ask for the port when the user has chosen an HP MF device as scanner model.
Diffstat (limited to 'perl-install/standalone')
-rwxr-xr-xperl-install/standalone/scannerdrake8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 95facfa73..afc8a864b 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -156,6 +156,10 @@ sub tryConfScanner {
removeverticalbar($model)));
return 0;
}
+ if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) {
+ $in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model)));
+ return 0;
+ }
if ($scanner::scannerDB->{$model}{ask} =~ /DEVICE/ || !$port) {
$port ||= N("Auto-detect available ports");
$in->ask_from('Scannerdrake',
@@ -223,10 +227,6 @@ sub tryConfScanner {
}
}
($vendor, $product) = scanner::get_usb_ids_for_port($port);
- if ($scanner::scannerDB->{$model}{server} =~ /(printerdrake|hpoj)/i) {
- $in->ask_warn('Scannerdrake', N("The %s must be configured by printerdrake.\nYou can launch printerdrake from the Mandrake Control Center in Hardware section.", removeverticalbar($model)));
- return 0;
- }
scanner::confScanner($model, $port, $vendor, $product);
$in->ask_warn(N("Congratulations!"),
N("Your %s has been configured.\nYou may now scan documents using \"XSane\" from Multimedia/Graphics in the applications menu.", removeverticalbar($model)));