diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-04-19 13:36:08 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-04-19 13:36:08 +0000 |
| commit | c2b44f66b9d3bccd78764b208feaa9d9a119a0a1 (patch) | |
| tree | d9a3be817d231502da399f056374e25491551ae0 /perl-install/install_steps_interactive.pm | |
| parent | 6a05c7c12fcc70058febc82d139dbe4155ac951b (diff) | |
| download | drakx-backup-do-not-use-c2b44f66b9d3bccd78764b208feaa9d9a119a0a1.tar drakx-backup-do-not-use-c2b44f66b9d3bccd78764b208feaa9d9a119a0a1.tar.gz drakx-backup-do-not-use-c2b44f66b9d3bccd78764b208feaa9d9a119a0a1.tar.bz2 drakx-backup-do-not-use-c2b44f66b9d3bccd78764b208feaa9d9a119a0a1.tar.xz drakx-backup-do-not-use-c2b44f66b9d3bccd78764b208feaa9d9a119a0a1.zip | |
no_comment
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index f1f0774b5..4b7fa5ae2 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -585,11 +585,15 @@ sub servicesConfig { sub printerConfig { my ($o, $clicked) = @_; - return if $::corporate && $::beginner && !$clicked; + return if $::corporate; require printer; - eval { add2hash($o->{printer} ||= {}, printer::getinfo($o->{prefix})) }; require printerdrake; + + if ($::beginner && !$clicked) { + printerdrake::auto_detect($o) or return; + } + eval { add2hash($o->{printer} ||= {}, printer::getinfo($o->{prefix})) }; printerdrake::main($o->{printer}, $o, sub { $o->pkg_install($_[0]) }); } |