diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-11 16:00:27 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-11 16:00:27 +0000 |
| commit | 3c76b9b600327f524fddddd94a4f344e8780b9ec (patch) | |
| tree | 507a4401e4c0f2ee616ebfc0b13060101f852c38 /perl-install/printerdrake.pm | |
| parent | e42659a0f9cae99c5062c902a567743d43349073 (diff) | |
| download | drakx-3c76b9b600327f524fddddd94a4f344e8780b9ec.tar drakx-3c76b9b600327f524fddddd94a4f344e8780b9ec.tar.gz drakx-3c76b9b600327f524fddddd94a4f344e8780b9ec.tar.bz2 drakx-3c76b9b600327f524fddddd94a4f344e8780b9ec.tar.xz drakx-3c76b9b600327f524fddddd94a4f344e8780b9ec.zip | |
Setup of HP MF devices on parallel port did not work. Fixed.
Allow setup of MF device if device file name "/dev/printer/<number>" was entered.
If auto-detection of model name fails, ask user always whether he has an MF device.
If SNMP or local auto-detection fails but HPOJ auto-detection succeeds, use model name found by HPOJ.
Diffstat (limited to 'perl-install/printerdrake.pm')
| -rw-r--r-- | perl-install/printerdrake.pm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index 9b00fd940..ba44bfad0 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -1182,7 +1182,12 @@ sub setup_common { my $ptaldevice = ""; my $isHPOJ = 0; if (($device =~ /^\/dev\//) || ($device =~ /^socket:\/\//)) { - if (!$do_auto_detect) { + # Ask user whether he has a multi-function device when he didn't + # do auto-detection or when auto-detection failed + my $searchunknown = _("Unknown model"); + if ((!$do_auto_detect) || + ($makemodel =~ /$searchunknown/i) || + ($makemodel =~ /^\s*$/)) { local $::isWizard = 0; $isHPOJ = $in->ask_yesorno(_("Local Printer"), _("Is your printer a multi-function device from HP or Sony (OfficeJet, PSC, LaserJet 1100/1200/1220/3200/3300 with scanner, Sony IJP-V100), an HP PhotoSmart or an HP LaserJet 2200?"), 0); |