diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-05 18:12:53 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2002-08-05 18:12:53 +0000 |
| commit | cbb14fa41aa61e834c2ee472c58164bc43eb87dd (patch) | |
| tree | 0632659ff7558b6e52c60cb7889d0897cf07f5bd | |
| parent | 1a56626ea5b1e025bff633327e5cb4f7aa263c16 (diff) | |
| download | drakx-cbb14fa41aa61e834c2ee472c58164bc43eb87dd.tar drakx-cbb14fa41aa61e834c2ee472c58164bc43eb87dd.tar.gz drakx-cbb14fa41aa61e834c2ee472c58164bc43eb87dd.tar.bz2 drakx-cbb14fa41aa61e834c2ee472c58164bc43eb87dd.tar.xz drakx-cbb14fa41aa61e834c2ee472c58164bc43eb87dd.zip | |
Make/Model/Driver list in expert mode: Fixed bug of "recommended" driver entries getting a duplicate entry without "recommended" when entering the list via double-click on existing queue / "Printer manufacturer, model, driver".
| -rw-r--r-- | perl-install/printerdrake.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm index b502fc486..d190638d8 100644 --- a/perl-install/printerdrake.pm +++ b/perl-install/printerdrake.pm @@ -1333,7 +1333,7 @@ sub setup_common { $descr =~ s/\s+\(?[Pp]rinter\)?$//; $printer->{DBENTRY} = ""; for my $entry (keys(%printer::thedb)) { - if ($entry =~ m!$descr!) { + if ($entry =~ m!$descr!i) { $printer->{DBENTRY} = $entry; last; } @@ -1427,7 +1427,7 @@ sub get_db_entry { $printer->{DBENTRY} = "$make|$model|$driverstr"; # database key contains the "(recommended)" for the # recommended driver, so add it if necessary - if (!($printer::thedb{$printer->{DBENTRY}}{printer})) { + if (!member($printer->{DBENTRY}, keys(%printer::thedb))) { $printer->{DBENTRY} .= " (recommended)"; } } else { @@ -1529,7 +1529,7 @@ sub choose_model { my $w = $in->wait_message('', _("Reading printer database...")); printer::read_printer_db($printer->{SPOOLER}); } - if (!$printer::thedb{$printer->{DBENTRY}}) { + if (!member($printer->{DBENTRY}, keys(%printer::thedb))) { $printer->{DBENTRY} = _("Raw printer (No driver)"); } # Choose the printer/driver from the list |