diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-03-05 11:35:25 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-03-05 11:35:25 +0000 |
| commit | 4a9c90abac2c027f3adf3120f8714fa293747b18 (patch) | |
| tree | 97bf7e8c55eab236e4b035e3065d976ade14ee34 /perl-install | |
| parent | 95d2fd2c6e391d74a5390365c2760cbba47ed768 (diff) | |
| download | drakx-4a9c90abac2c027f3adf3120f8714fa293747b18.tar drakx-4a9c90abac2c027f3adf3120f8714fa293747b18.tar.gz drakx-4a9c90abac2c027f3adf3120f8714fa293747b18.tar.bz2 drakx-4a9c90abac2c027f3adf3120f8714fa293747b18.tar.xz drakx-4a9c90abac2c027f3adf3120f8714fa293747b18.zip | |
Added support for HP's newest MF devices: HP OfficeJet D series, HP LaserJet 33xx MFP.
Fixed bug of printerdrake sometimes assuming the user has an MF device when he has typed the device file name in the expert mode.
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/printerdrake.pm | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index fdb8b158c..50b520dda 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -444,6 +444,10 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 )) { return 0; } + if ($device ne $menuentries->{$menuchoice}) { + $menuchoice = ""; + $do_auto_detect = 0; + } if ($manualconf) { $printer->{MANUAL} = 1; } else { @@ -460,7 +464,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 if (!$do_auto_detect) { local $::isWizard = 0; $isHPOJ = $in->ask_yesorno(_("Local Printer"), - _("Is your printer a multi-function device from HP (OfficeJet, PSC, PhotoSmart LaserJet 1100/1200/1220/3200 with scanner)?"), 0); + _("Is your printer a multi-function device from HP (OfficeJet, PSC, PhotoSmart, LaserJet 1100/1200/1220/3200/3300 with scanner)?"), 0); } if (($menuchoice =~ /HP\s+OfficeJet/i) || ($menuchoice =~ /HP\s+PSC/i) || @@ -469,6 +473,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 ($menuchoice =~ /HP\s+LaserJet\s+1200/i) || ($menuchoice =~ /HP\s+LaserJet\s+1220/i) || ($menuchoice =~ /HP\s+LaserJet\s+3200/i) || + ($menuchoice =~ /HP\s+LaserJet\s+33.0/i) || ($isHPOJ)) { # Install HPOJ package if ((!$::testing) && @@ -484,7 +489,7 @@ _(" (Parallel Ports: /dev/lp0, /dev/lp1, ..., equivalent to LPT1:, LPT2:, ..., 1 if ($ptaldevice) { # Configure scanning with SANE on the MF device - if (($menuchoice =~ /HP\s+OfficeJet\s+[KVRGP]/i) || + if (($menuchoice =~ /HP\s+OfficeJet\s+[KVRGPD]/i) || ($menuchoice =~ /HP\s+PSC\s+[579]/i)) { # Install SANE if ((!$::testing) && |