From d675cb7bcea2107ce3d40624e4ff722e66dd3674 Mon Sep 17 00:00:00 2001
From: Till Kamppeter <tkamppeter@mandriva.com>
Date: Sat, 14 Feb 2004 19:56:30 +0000
Subject: Made printerdrake handling even very weird printer ID strings, as the
 one of the Brother HL-720 with empty manufacturer and description fields (Bug
 #7753).

---
 perl-install/printer/printerdrake.pm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'perl-install/printer/printerdrake.pm')

diff --git a/perl-install/printer/printerdrake.pm b/perl-install/printer/printerdrake.pm
index 3e55f2f81..af648d038 100644
--- a/perl-install/printer/printerdrake.pm
+++ b/perl-install/printer/printerdrake.pm
@@ -1951,9 +1951,14 @@ sub setup_common {
 	    $descr = "$descrmake|$autosku";
 	} elsif ($automake && $automodel) {
 	    $descr = "$descrmake|$automodel";
-	} else {
+	} elsif ($autodescr) {
 	    $descr = $autodescr;
 	    $descr =~ s/ /|/;
+	} elsif ($automodel) {
+	    $descr = $automodel;
+	    $descr =~ s/ /|/;
+	} elsif ($automake) {
+	    $descr = "$descrmake|";
 	}
 	# Remove manufacturer's name from the beginning of the
 	# description (do not do this with manufacturer names which
-- 
cgit v1.2.1