From c40d46072080be5060f50e6ad1cd12dc630b5162 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 24 Sep 2004 06:41:19 +0000
Subject: install_steps must not call a method only defined in
 install_steps_interactive, inline it

---
 perl-install/install_steps.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'perl-install/install_steps.pm')

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;
     }
 
-- 
cgit v1.2.1