summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-06-11 09:49:53 +0000
committerFrancois Pons <fpons@mandriva.com>2001-06-11 09:49:53 +0000
commitf35f2383eed07ff16aa76f30975817117eea6cbb (patch)
tree7ae3ed045f01c1cc340f151f22b8a2c829021c54
parent90371dac6ff748bff3c4f35ea46710bd7778c738 (diff)
downloaddrakx-backup-do-not-use-f35f2383eed07ff16aa76f30975817117eea6cbb.tar
drakx-backup-do-not-use-f35f2383eed07ff16aa76f30975817117eea6cbb.tar.gz
drakx-backup-do-not-use-f35f2383eed07ff16aa76f30975817117eea6cbb.tar.bz2
drakx-backup-do-not-use-f35f2383eed07ff16aa76f30975817117eea6cbb.tar.xz
drakx-backup-do-not-use-f35f2383eed07ff16aa76f30975817117eea6cbb.zip
applied patches given for printer configuration bug reported by David Eastcott.
-rw-r--r--perl-install/install_steps.pm4
-rw-r--r--perl-install/printer.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 7e0d3f3f4..1817466d3 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -553,8 +553,8 @@ sub configurePrinter {
eval { add2hash($o->{printer}, printer::getinfo($o->{prefix})) }; #- get existing configuration.
$use_cups and printer::poll_ppd_base();
$use_lpr and printer::read_printer_db();
- foreach (keys %{$o->{printer}{configured} || {}}) {
- log::l("configuring printer queue $_->{queue} for $_->{mode}");
+ foreach (values %{$o->{printer}{configured} || {}}) {
+ log::l("configuring printer queue $_->{QUEUE} for $_->{mode}");
printer::copy_printer_params($_, $o->{printer});
#- setup all configured queues, which is not the case interactively where
#- only the working queue is setup on configuration.
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index bb2b15252..2eb683eb2 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -598,7 +598,7 @@ sub configure_queue($) {
if ($_->{TYPE} eq "LOCAL") {
print PRINTCAP "\t:lp=$_->{DEVICE}:\\\n";
- } elsif ($_->{TYPE} eq "REMOTE") {
+ } elsif ($_->{TYPE} eq "LPD") {
print PRINTCAP "\t:rm=$_->{REMOTEHOST}:\\\n";
print PRINTCAP "\t:rp=$_->{REMOTEQUEUE}:\\\n";
} else {