diff options
| author | Till Kamppeter <tkamppeter@mandriva.com> | 2003-03-02 16:36:55 +0000 |
|---|---|---|
| committer | Till Kamppeter <tkamppeter@mandriva.com> | 2003-03-02 16:36:55 +0000 |
| commit | 3913f75a8c7d164dd1c855a778ea56d2911c90a0 (patch) | |
| tree | 9faf394071fb868b477a07e0da0e10bee1950195 | |
| parent | b5b93d92f29791ae154bb59559e2b47eb9d5523a (diff) | |
| download | drakx-backup-do-not-use-3913f75a8c7d164dd1c855a778ea56d2911c90a0.tar drakx-backup-do-not-use-3913f75a8c7d164dd1c855a778ea56d2911c90a0.tar.gz drakx-backup-do-not-use-3913f75a8c7d164dd1c855a778ea56d2911c90a0.tar.bz2 drakx-backup-do-not-use-3913f75a8c7d164dd1c855a778ea56d2911c90a0.tar.xz drakx-backup-do-not-use-3913f75a8c7d164dd1c855a778ea56d2911c90a0.zip | |
Correction on reading the Foomatic overview.
| -rw-r--r-- | perl-install/printer/main.pm | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm index 2a7f46c4f..76a0f74aa 100644 --- a/perl-install/printer/main.pm +++ b/perl-install/printer/main.pm @@ -427,18 +427,14 @@ sub read_printer_db(;$) { } elsif (m!^\s*<ieee1284>\s*([^<>]+)\s*</ieee1284>\s*$!) { # Full ID string my $idstr = $1; - $idstr =~ m!(MFG|MANUFACTURER):([^;]+);!i; - $entry->{devidmake} = $2; - undef $2; - $idstr =~ m!(MDL|MODEL):([^;]+);!i; - $entry->{devidmodel} = $2; - undef $2; - $idstr =~ m!(DES|DESCRIPTION):([^;]+);!i; - $entry->{deviddesc} = $2; - undef $2; - $idstr =~ m!(CMD|COMMAND\s*SET):([^;]+);!i; - $entry->{devidcmdset} = $2; - undef $2; + $idstr =~ m!(MFG|MANUFACTURER):([^;]+);!i + and $entry->{devidmake} = $2; + $idstr =~ m!(MDL|MODEL):([^;]+);!i + and $entry->{devidmodel} = $2; + $idstr =~ m!(DES|DESCRIPTION):([^;]+);!i + and $entry->{deviddesc} = $2; + $idstr =~ m!(CMD|COMMAND\s*SET):([^;]+);!i + and $entry->{devidcmdset} = $2; } } else { if (m!^.*</autodetect>\s*$!) { |