diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2004-02-14 19:56:30 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2004-02-14 19:56:30 +0000 |
| commit | d675cb7bcea2107ce3d40624e4ff722e66dd3674 (patch) | |
| tree | eec69507294f0fb6fd9d1210301245fc02117f3d | |
| parent | 3f00e6d14d872e59fd3998b874d9bf1bc627462f (diff) | |
| download | drakx-d675cb7bcea2107ce3d40624e4ff722e66dd3674.tar drakx-d675cb7bcea2107ce3d40624e4ff722e66dd3674.tar.gz drakx-d675cb7bcea2107ce3d40624e4ff722e66dd3674.tar.bz2 drakx-d675cb7bcea2107ce3d40624e4ff722e66dd3674.tar.xz drakx-d675cb7bcea2107ce3d40624e4ff722e66dd3674.zip | |
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).
| -rw-r--r-- | perl-install/printer/printerdrake.pm | 7 |
1 files changed, 6 insertions, 1 deletions
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 |