From 95607c5d088e74f1739c69e26235ef7e91cfeb05 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 8 Sep 2004 07:08:52 +0000
Subject: Don't require installation of foomatic-db-engine when installing from
 the mini CD (bug #11292)

---
 perl-install/install_steps.pm | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index cb5e879e6..6f4f49070 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -715,9 +715,16 @@ sub configureServices {
 #------------------------------------------------------------------------------
 sub configurePrinter {
     my ($o) = @_;
-    $o->do_pkgs->install('foomatic-filters', 'foomatic-db-engine', 'foomatic-db', 'printer-utils', 'printer-testpages',
-			 if_($o->do_pkgs->is_installed('gimp'), 'gimpprint'));
-    
+    eval {
+	$o->do_pkgs->install('foomatic-filters', 'foomatic-db-engine', 'foomatic-db', 'printer-utils', 'printer-testpages',
+			     if_($o->do_pkgs->is_installed('gimp'), 'gimpprint'));
+    };
+    if ($@ =~ /rpm not found/) {
+	$o->cleanupPrinter;
+	log::l($@);
+	return;
+    }
+
     require printer::main;
     eval { add2hash($o->{printer} ||= {}, printer::main::getinfo($o->{prefix})) }; #- get existing configuration.
 
-- 
cgit v1.2.1