summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2002-11-12 14:34:34 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2002-11-12 14:34:34 +0000
commita4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3 (patch)
tree6cc9a4832486e8c9cd67bcf01d20e79d4c85c1ec /perl-install
parent8ca1bcb9079fc94012955982e7a6e5ace8865bbc (diff)
downloaddrakx-backup-do-not-use-a4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3.tar
drakx-backup-do-not-use-a4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3.tar.gz
drakx-backup-do-not-use-a4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3.tar.bz2
drakx-backup-do-not-use-a4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3.tar.xz
drakx-backup-do-not-use-a4b3998ec5d4abe0ed17ca7251dd3e6db6d321d3.zip
update for new printerdrake
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install_steps.pm14
1 files changed, 7 insertions, 7 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c4f92b8bc..4b726729a 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -695,22 +695,22 @@ sub configurePrinter {
$o->do_pkgs->install('foomatic', 'printer-utils','printer-testpages',
if_($o->do_pkgs->is_installed('gimp'), 'gimpprint'));
- require printer;
- eval { add2hash($o->{printer} ||= {}, printer::getinfo($o->{prefix})) }; #- get existing configuration.
+ require printer::main;
+ eval { add2hash($o->{printer} ||= {}, printer::main::getinfo($o->{prefix})) }; #- get existing configuration.
- require printerdrake;
- printerdrake::install_spooler($o->{printer}, $o); #- not interactive...
+ require printer::printerdrake;
+ printer::printerdrake::install_spooler($o->{printer}, $o); #- not interactive...
foreach (values %{$o->{printer}{configured} || {}}) {
log::l("configuring printer queue " . $_->{queuedata}{queue} || $_->{QUEUE});
#- when copy is so adulée (sorry french taste :-)
#- and when there are some configuration in one place and in another place...
$o->{printer}{currentqueue} = {};
- printer::copy_printer_params($_->{queuedata}, $o->{printer}{currentqueue});
- printer::copy_printer_params($_, $o->{printer});
+ printer::main::copy_printer_params($_->{queuedata}, $o->{printer}{currentqueue});
+ printer::main::copy_printer_params($_, $o->{printer});
#- setup all configured queues, which is not the case interactively where
#- only the working queue is setup on configuration.
- printer::configure_queue($o->{printer});
+ printer::main::configure_queue($o->{printer});
}
}