summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-08 07:08:52 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-09-08 07:08:52 +0000
commit95607c5d088e74f1739c69e26235ef7e91cfeb05 (patch)
treefa5f108cc1ccd2c4fbd0ad49fb308a9d7b8e3add
parent63e90060206ee4607f1bd1faa82b4eaa770276a1 (diff)
downloaddrakx-95607c5d088e74f1739c69e26235ef7e91cfeb05.tar
drakx-95607c5d088e74f1739c69e26235ef7e91cfeb05.tar.gz
drakx-95607c5d088e74f1739c69e26235ef7e91cfeb05.tar.bz2
drakx-95607c5d088e74f1739c69e26235ef7e91cfeb05.tar.xz
drakx-95607c5d088e74f1739c69e26235ef7e91cfeb05.zip
Don't require installation of foomatic-db-engine when installing from the
mini CD (bug #11292)
-rw-r--r--perl-install/install_steps.pm13
1 files changed, 10 insertions, 3 deletions
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.