summaryrefslogtreecommitdiffstats
path: root/perl-install/printer
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2005-09-02 12:31:26 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2005-09-02 12:31:26 +0000
commit4e04c64b2a426b027f1af69c0188082c035bb382 (patch)
treebf606cfff971b3b7884db61135f1302e4b55ac05 /perl-install/printer
parenta83524b0c2c9fae3824d72570e4b1245bcada7da (diff)
downloaddrakx-4e04c64b2a426b027f1af69c0188082c035bb382.tar
drakx-4e04c64b2a426b027f1af69c0188082c035bb382.tar.gz
drakx-4e04c64b2a426b027f1af69c0188082c035bb382.tar.bz2
drakx-4e04c64b2a426b027f1af69c0188082c035bb382.tar.xz
drakx-4e04c64b2a426b027f1af69c0188082c035bb382.zip
- Use printer name determined by HPLIP to auto-select PPD file of a
network printer where the model name was not determined by SNMP.
Diffstat (limited to 'perl-install/printer')
-rw-r--r--perl-install/printer/printerdrake.pm3
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 46e5a2fdf..7fd9d5496 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -2522,7 +2522,8 @@ sub setup_common {
printer::main::hplip_device_entry_from_uri
($hplipdevice);
}
- if ($makemodel !~ /\S/) {
+ if (($makemodel !~ /\S/) ||
+ ($makemodel =~ /$searchunknown/)) {
$makemodel = $hplipentry->{model};
$makemodel =~ s/_/ /g;
$makemodel = "HP " . $makemodel