summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/printerdrake.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-01-21 02:27:57 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-01-21 02:27:57 +0000
commit23d074d2dbac7fd9507b102657cff2a5f2d2da1a (patch)
tree5638d9658cec29ffc79356f0e0faca3a7a40e902 /perl-install/printer/printerdrake.pm
parentddc8f09a87fac43c566afa4f9f691ae3f2edc8b6 (diff)
downloaddrakx-23d074d2dbac7fd9507b102657cff2a5f2d2da1a.tar
drakx-23d074d2dbac7fd9507b102657cff2a5f2d2da1a.tar.gz
drakx-23d074d2dbac7fd9507b102657cff2a5f2d2da1a.tar.bz2
drakx-23d074d2dbac7fd9507b102657cff2a5f2d2da1a.tar.xz
drakx-23d074d2dbac7fd9507b102657cff2a5f2d2da1a.zip
- Support for manufacturer-supplied PostScript PPDs also in recommended
mode. - If "Foomatic + Postscript" is recommended driver for a printer and a manufacturer-supplied PPD file exists for it, the PPD file gets the recommended driver. - Tried to extract IEEE-1284 auto-detection info from the PPD files but this takes too long time (40 sec for 800 PPDs). - Fixed long-standing bug in activation of auto-load of the USB "printer" kernel module.
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
-rw-r--r--perl-install/printer/printerdrake.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 1ad34fbaa..f4100bcab 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -1595,7 +1595,7 @@ sub setup_common {
if ($mfg = $printer::main::thedb{$entry}{devidmake}) {
$mfg =~ s/Hewlett[-\s_]Packard/HP/;
$mfg =~ s/HEWLETT[-\s_]PACKARD/HP/;
- if ($mfg ne $automake) {
+ if (uc($mfg) ne uc($automake)) {
$matched = 0;
}
}
@@ -1754,7 +1754,7 @@ sub get_db_entry {
$printer->{DBENTRY} = "$make|$model";
}
$printer->{OLD_CHOICE} = $printer->{DBENTRY};
- } elsif ($printer->{SPOOLER} eq "cups" && $::expert &&
+ } elsif ($printer->{SPOOLER} eq "cups" &&
$printer->{configured}{$queue}{queuedata}{ppd}) {
# Do we have a native CUPS driver or a PostScript PPD file?
$printer->{DBENTRY} = printer::main::get_descr_from_ppd($printer) || $printer->{DBENTRY};