summaryrefslogtreecommitdiffstats
path: root/perl-install/printer.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2001-08-01 18:17:15 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2001-08-01 18:17:15 +0000
commit45a8f2704e6b1f9760b86c2bb6748c546fb38f32 (patch)
treef91400086520c52879863a0ce83575093113906d /perl-install/printer.pm
parent4f50833a5c207bcf42fc8b8a5b4c5d329d3aaa11 (diff)
downloaddrakx-45a8f2704e6b1f9760b86c2bb6748c546fb38f32.tar
drakx-45a8f2704e6b1f9760b86c2bb6748c546fb38f32.tar.gz
drakx-45a8f2704e6b1f9760b86c2bb6748c546fb38f32.tar.bz2
drakx-45a8f2704e6b1f9760b86c2bb6748c546fb38f32.tar.xz
drakx-45a8f2704e6b1f9760b86c2bb6748c546fb38f32.zip
Fixed bug in recognizing the printer ID in the Foomatic overview.
Diffstat (limited to 'perl-install/printer.pm')
-rw-r--r--perl-install/printer.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index 59c5b0c2e..59f4ce9a0 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -1,10 +1,10 @@
package printer;
# $Id$
-use diagnostics;
-use strict;
-use vars qw(%thedb %spooler %spooler_inv %printer_type %printer_type_inv @entries_db_short @entry_db_description %descr_to_help %descr_to_db %db_to_descr %descr_to_ppd);
+
+
+
use common;
use commands;
@@ -226,7 +226,7 @@ sub read_printer_db(;$) {
}
}
$entry = {};
- } elsif (m!^\s*<id>\s*([0-9]+)\s*</id>\s*$!) {
+ } elsif (m!^\s*<id>\s*([^\s<>]+)\s*</id>\s*$!) {
# Foomatic printer ID
$entry->{id} = $1;
} elsif (m!^\s*<make>(.+)</make>\s*$!) {