summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/detect.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-09-17 12:29:23 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-09-17 12:29:23 +0000
commitb37a9b48099abef8c9d9708e923ceec030c1416f (patch)
tree75228c11edd260458ac0649dc300cfd8fff47c69 /perl-install/printer/detect.pm
parent081f83adaeca9dffd966108961b6397ca99af9f1 (diff)
downloaddrakx-b37a9b48099abef8c9d9708e923ceec030c1416f.tar
drakx-b37a9b48099abef8c9d9708e923ceec030c1416f.tar.gz
drakx-b37a9b48099abef8c9d9708e923ceec030c1416f.tar.bz2
drakx-b37a9b48099abef8c9d9708e923ceec030c1416f.tar.xz
drakx-b37a9b48099abef8c9d9708e923ceec030c1416f.zip
- On USB printer hot-plugging sometimes parallel printers are also
shown in the window popping up to ask whether the printer should be set up. Even sometimes parallel printers which are not connected or turned on any more were shown. Fixed.
Diffstat (limited to 'perl-install/printer/detect.pm')
-rw-r--r--perl-install/printer/detect.pm6
1 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/printer/detect.pm b/perl-install/printer/detect.pm
index 97273a5ea..b164595a5 100644
--- a/perl-install/printer/detect.pm
+++ b/perl-install/printer/detect.pm
@@ -10,11 +10,13 @@ sub local_detect() {
modules::any_conf->read->get_probeall("usb-interface") and eval { modules::load($usbprintermodule) };
# Reload parallel port modules only when we were not called by
# automatic setup of print queues, to avoid recursive calls
- if (!$::autoqueue) {
+ if ($::autoqueue) {
+ whatUsbport();
+ } else {
eval { modules::unload(qw(lp parport_pc ppdev parport)) }; #- on kernel 2.4 parport has to be unloaded to probe again
eval { modules::load(qw(ppdev parport_pc lp)) }; #- take care as not available on 2.4 kernel (silent error).
+ whatPrinter();
}
- whatPrinter();
}
sub net_detect { whatNetPrinter(1, 0, @_) }