summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2004-08-20 07:54:23 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2004-08-20 07:54:23 +0000
commitc255f79b08ede9bd82d2dd8e120e527f116dae32 (patch)
treebb6c5c5d3fc011afc614a7e71634c08a8643e8b1
parentedffc19949007422de3e432754eb370ea595e20b (diff)
downloaddrakx-backup-do-not-use-c255f79b08ede9bd82d2dd8e120e527f116dae32.tar
drakx-backup-do-not-use-c255f79b08ede9bd82d2dd8e120e527f116dae32.tar.gz
drakx-backup-do-not-use-c255f79b08ede9bd82d2dd8e120e527f116dae32.tar.bz2
drakx-backup-do-not-use-c255f79b08ede9bd82d2dd8e120e527f116dae32.tar.xz
drakx-backup-do-not-use-c255f79b08ede9bd82d2dd8e120e527f116dae32.zip
- Fixed problem of Brother laser printer on parallel port not showing its name in auto-detection result.
-rw-r--r--perl-install/printer/printerdrake.pm8
1 files changed, 6 insertions, 2 deletions
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);