diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2005-03-01 21:51:23 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2005-03-01 21:51:23 +0000 |
| commit | 7583963457122119f2b759bc5cc6332f1f033f67 (patch) | |
| tree | 681fae27191da314eb3901722b3a080907cf9a69 /perl-install/printer/printerdrake.pm | |
| parent | 628da666af9162874c079f40063af27aa5ed230a (diff) | |
| download | drakx-backup-do-not-use-7583963457122119f2b759bc5cc6332f1f033f67.tar drakx-backup-do-not-use-7583963457122119f2b759bc5cc6332f1f033f67.tar.gz drakx-backup-do-not-use-7583963457122119f2b759bc5cc6332f1f033f67.tar.bz2 drakx-backup-do-not-use-7583963457122119f2b759bc5cc6332f1f033f67.tar.xz drakx-backup-do-not-use-7583963457122119f2b759bc5cc6332f1f033f67.zip | |
- Make sure that recommended driver is preselected in expert mode, even if the
recommended driver is a manufacturer-supplied PPD with language tag.
Diffstat (limited to 'perl-install/printer/printerdrake.pm')
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 7049f5bd9..eda1f11ba 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -2855,7 +2855,7 @@ sub get_db_entry { } foreach my $key (keys %printer::main::thedb) { if ($printer->{expert} && - $key =~ /^$make\|$model\|.*\(recommended\)$/ || + $key =~ /^$make\|$model\|.*\(recommended\).*$/ || !$printer->{expert} && $key =~ /^$make\|$model$/) { $printer->{DBENTRY} = $key; } @@ -2868,7 +2868,7 @@ sub get_db_entry { $model =~ s/PostScript//i; $model =~ s/Series//i; foreach my $key (keys %printer::main::thedb) { - if ($printer->{expert} && $key =~ /^$make\|$model\|.*\(recommended\)$/ || + if ($printer->{expert} && $key =~ /^$make\|$model\|.*\(recommended\).*$/ || !$printer->{expert} && $key =~ /^$make\|$model$/) { $printer->{DBENTRY} = $key; } @@ -2895,7 +2895,7 @@ sub get_db_entry { if ($printer->{expert} && $printer->{DBENTRY} !~ /(recommended)/) { my ($make, $model) = $printer->{DBENTRY} =~ /^([^\|]+)\|([^\|]+)\|/; foreach my $key (keys %printer::main::thedb) { - if ($key =~ /^$make\|$model\|.*\(recommended\)$/) { + if ($key =~ /^$make\|$model\|.*\(recommended\).*$/) { $printer->{DBENTRY} = $key; } } |