summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-08-21 17:53:23 +0000
committerFrancois Pons <fpons@mandriva.com>2001-08-21 17:53:23 +0000
commit42a4c7a03dc9674f998fdd53c3d8188911c29566 (patch)
treeef28f254ddbfd9a552065b7ddd75afba66ea75c4
parent203fe77dac0199ad90ca280cf9a28443206c5355 (diff)
downloaddrakx-backup-do-not-use-42a4c7a03dc9674f998fdd53c3d8188911c29566.tar
drakx-backup-do-not-use-42a4c7a03dc9674f998fdd53c3d8188911c29566.tar.gz
drakx-backup-do-not-use-42a4c7a03dc9674f998fdd53c3d8188911c29566.tar.bz2
drakx-backup-do-not-use-42a4c7a03dc9674f998fdd53c3d8188911c29566.tar.xz
drakx-backup-do-not-use-42a4c7a03dc9674f998fdd53c3d8188911c29566.zip
moved installation code of foomatic (only) if a printer may be chosen.
-rw-r--r--perl-install/install_steps_interactive.pm10
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} ||= {};