diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-09-24 06:41:19 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-09-24 06:41:19 +0000 |
| commit | c40d46072080be5060f50e6ad1cd12dc630b5162 (patch) | |
| tree | 780576a76671010000bd2b78091b0ab6c2bc1db9 | |
| parent | bdea8c76359c44258ebaa162ca463c3ba3ee4ecf (diff) | |
| download | drakx-c40d46072080be5060f50e6ad1cd12dc630b5162.tar drakx-c40d46072080be5060f50e6ad1cd12dc630b5162.tar.gz drakx-c40d46072080be5060f50e6ad1cd12dc630b5162.tar.bz2 drakx-c40d46072080be5060f50e6ad1cd12dc630b5162.tar.xz drakx-c40d46072080be5060f50e6ad1cd12dc630b5162.zip | |
install_steps must not call a method only defined in install_steps_interactive, inline it
| -rw-r--r-- | perl-install/install_steps.pm | 7 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 9 |
2 files changed, 5 insertions, 11 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index a8f86af4e..aac003eaa 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -721,8 +721,11 @@ sub configurePrinter { if_($o->do_pkgs->is_installed('gimp'), 'gimpprint')); }; if ($@ =~ /rpm not found/) { - $o->cleanupPrinter; - log::l($@); + log::l("ERROR: $@"); + if ($o->{printer}) { + require printer::printerdrake; + printer::printerdrake::final_cleanup($o->{printer}); + } return; } diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index afee41a6f..8fa31372d 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -1178,15 +1178,6 @@ sub configurePrinter { printer::printerdrake::main($printer, $o, $clicked, sub { install_interactive::upNetwork($o, 'pppAvoided') }); } - -sub cleanupPrinter { - my ($o) = @_; - #- Clean up $o->{printer} so that the records for an auto-installation - #- contain only the important stuff - return if !defined($o->{printer}); - require printer::printerdrake; - printer::printerdrake::final_cleanup($o->{printer}); -} #------------------------------------------------------------------------------ sub setRootPassword { |