summaryrefslogtreecommitdiffstats
path: root/perl-install/printer/main.pm
diff options
context:
space:
mode:
authorTill Kamppeter <tkamppeter@mandriva.com>2003-01-29 03:01:53 +0000
committerTill Kamppeter <tkamppeter@mandriva.com>2003-01-29 03:01:53 +0000
commit994bebb1a6c6efbf24786040db65427ee5b39c72 (patch)
treec12206780c31f42b3608409b7316be40267aee73 /perl-install/printer/main.pm
parent76146269a480fe664fc4a3280dd78c9070496b06 (diff)
downloaddrakx-994bebb1a6c6efbf24786040db65427ee5b39c72.tar
drakx-994bebb1a6c6efbf24786040db65427ee5b39c72.tar.gz
drakx-994bebb1a6c6efbf24786040db65427ee5b39c72.tar.bz2
drakx-994bebb1a6c6efbf24786040db65427ee5b39c72.tar.xz
drakx-994bebb1a6c6efbf24786040db65427ee5b39c72.zip
- Automatic non-interactive installation of local print queues.
- Standard and advanced options selected by option groups in PPD. - Fixed bug of "CUPS + GIMP-Print" drivers being preferred against "Foomatic + gimp-print" drivers in beginners mode. - Foomatic package installation adapted to Foomatic 2.9.x.
Diffstat (limited to 'perl-install/printer/main.pm')
-rw-r--r--perl-install/printer/main.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/perl-install/printer/main.pm b/perl-install/printer/main.pm
index 1a047ad1a..9c51cbbb3 100644
--- a/perl-install/printer/main.pm
+++ b/perl-install/printer/main.pm
@@ -1554,13 +1554,11 @@ sub poll_ppd_base {
if (!$::expert) {
# Remove driver from printer list entry when in
# recommended mode
- my $simplekey = $key;
- $simplekey =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
+ $key =~ s/^([^\|]+\|[^\|]+)\|.*$/$1/;
# Only replace the printer entry when it uses a
# "Foomatic + Postscript" driver
next if (defined($thedb{$key}) &&
($thedb{$key}{driver} !~ /PostScript/i));
- $key = $simplekey;
# Remove the old entry
delete $thedb{$key};
} elsif (defined