From c255f79b08ede9bd82d2dd8e120e527f116dae32 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Fri, 20 Aug 2004 07:54:23 +0000 Subject: - Fixed problem of Brother laser printer on parallel port not showing its name in auto-detection result. --- perl-install/printer/printerdrake.pm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm index 736164b6c..b1ab3aac7 100644 --- a/perl-install/printer/printerdrake.pm +++ b/perl-install/printer/printerdrake.pm @@ -928,8 +928,12 @@ sub setup_local_autoscan { $printer->{MORETHANONE} = $#autodetected > 0; my @str; foreach my $p (@autodetected) { - if ($p->{val}{DESCRIPTION}) { - my $menustr = $p->{val}{DESCRIPTION}; + if (($p->{val}{DESCRIPTION}) || ($p->{val}{MODEL})) { + my $menustr = ($p->{val}{DESCRIPTION} ? + $p->{val}{DESCRIPTION} : + (($p->{val}{MANUFACTURER} ? + ($p->{val}{MANUFACTURER} . " ") : ()) . + $p->{val}{MODEL})); if ($p->{port} =~ m!^/dev/lp(\d+)$!) { my $port = $1; $menustr .= N(" on parallel port #%s", $port); -- cgit v1.2.1