diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index d25f85ab9..6744aa96b 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -896,16 +896,14 @@ sub configurePrinter { require printer; require printerdrake; - if (!$::testing) { - $o->do_pkgs->install('foomatic', 'printer-utils','printer-testpages', - if_($o->do_pkgs->is_installed('gimp'), 'gimpprint')); - } - #- try to determine if a question should be asked to the user or #- if he is autorized to configure multiple queues. - my $ask_multiple_printer = !$::expert && !$clicked ? scalar(printerdrake::auto_detect($o)) : 2; + my $ask_multiple_printer = ($::expert || $clicked) && 2 || scalar(printerdrake::auto_detect($o)); $ask_multiple_printer-- or return; + #- install packages needed for printer::getinfo() + $::testing or $o->do_pkgs->install('foomatic'); + #- take default configuration, this include choosing the right system #- currently used by the system. my $printer = $o->{printer} ||= {}; |