summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-10-31 12:32:37 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-10-31 12:32:37 +0000
commit26f0e5a0fa47d969ab929a1783bfd8813df55fda (patch)
tree36cf2310cf25bb5b906ba50f47e7ddaaf5553223
parent47b4b48b14a4b4d2fc55898ba80094d23198846a (diff)
downloaddrakx-26f0e5a0fa47d969ab929a1783bfd8813df55fda.tar
drakx-26f0e5a0fa47d969ab929a1783bfd8813df55fda.tar.gz
drakx-26f0e5a0fa47d969ab929a1783bfd8813df55fda.tar.bz2
drakx-26f0e5a0fa47d969ab929a1783bfd8813df55fda.tar.xz
drakx-26f0e5a0fa47d969ab929a1783bfd8813df55fda.zip
- Fixed setting up printers with pre-made Foomatic PPD in
/usr/share/cups/model (bug #19524).
-rw-r--r--perl-install/printer/main.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 25f58474b..fa633e0cc 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -635,7 +635,9 @@ sub read_printer_db {
$entry->{ENTRY} =~ s/^CITOH/C.ITOH/i;
$entry->{ENTRY} =~
s/^KYOCERA[\s\-]*MITA/KYOCERA/i;
- if ($entry->{defaultdriver}) {
+ if (($entry->{defaultdriver}) &&
+ (member($entry->{defaultdriver},
+ @{$entry->{drivers}}))) {
my $driver = $entry->{defaultdriver};
$entry->{driver} = $driver;
if (defined($ppds->{$driver})) {