From a7fcf9a502396358d2742eb9ea42f989ed5c6889 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Mon, 24 Feb 2003 15:36:06 +0000
Subject: 4.2-23mdk

---
 urpm.pm    | 8 ++++----
 urpme      | 2 +-
 urpmi.spec | 5 ++++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/urpm.pm b/urpm.pm
index acdc958e..dd454f50 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -847,7 +847,7 @@ sub configure {
 	local $SIG{QUIT} = $sig_handler;
 	local *RPMDB;
 
-	$db or $urpm->{fatal}(_("unable to open rpmdb"));
+	$db or $urpm->{fatal}(9, _("unable to open rpmdb"));
 	open RPMDB, "| " . ($ENV{LD_LOADER} || '') . " gzip -9 >'$options{bug}/rpmdb.cz'";
 	$db->traverse(sub {
 			  my ($p) = @_;
@@ -2014,7 +2014,7 @@ sub resolve_dependencies {
 	    $db->parse_synthesis($options{rpmdb});
 	} else {
 	    $db = URPM::DB::open($urpm->{root});
-	    $db or $urpm->{fatal}(_("unable to open rpmdb"));
+	    $db or $urpm->{fatal}(9, _("unable to open rpmdb"));
 	}
 
 	my $sig_handler = sub { undef $db; exit 3 };
@@ -2430,7 +2430,7 @@ sub install {
     my ($urpm, $remove, $install, $upgrade, %options) = @_;
     my $db = URPM::DB::open($urpm->{root}, !$options{test}); #- open in read/write mode unless testing installation.
 
-    $db or $urpm->{fatal}(_("unable to open rpmdb"));
+    $db or $urpm->{fatal}(9, _("unable to open rpmdb"));
 
     my $trans = $db->create_transaction($urpm->{root});
     my ($update, @l, %file2pkg) = 0;
@@ -2514,7 +2514,7 @@ sub find_packages_to_remove {
 	my $db = URPM::DB::open($options{root});
 	my (@m, @notfound);
 
-	$db or $urpm->{fatal}(_("unable to open rpmdb"));
+	$db or $urpm->{fatal}(9, _("unable to open rpmdb"));
 
 	if (!$options{matches}) {
 	    foreach (@$l) {
diff --git a/urpme b/urpme
index 5c7b4d77..0216393a 100644
--- a/urpme
+++ b/urpme
@@ -110,7 +110,7 @@ if ($test && $auto) {
 @l = $parallel ?
   $urpm->parallel_remove(\@toremove, test => $test, translate_message => 1) :
   $urpm->install(\@toremove, {}, {}, test => $test, translate_message => 1);
-@l and $urpm->{fatal}(1, _("Removing failed") . ":\n" . join("\n",  map { "\t$_" } @l));
+@l and $urpm->{fatal}(2, _("Removing failed") . ":\n" . join("\n",  map { "\t$_" } @l));
 
 sub toMb {
     my $nb = $_[0] / 1024 / 1024;
diff --git a/urpmi.spec b/urpmi.spec
index b35d9949..83c1bee9 100644
--- a/urpmi.spec
+++ b/urpmi.spec
@@ -2,7 +2,7 @@
 
 Name: urpmi
 Version: 4.2
-Release: 22mdk
+Release: 23mdk
 License: GPL
 Source0: %{name}.tar.bz2
 Source1: %{name}.logrotate
@@ -206,6 +206,9 @@ fi
 
 
 %changelog
+* Mon Feb 24 2003 François Pons <fpons@mandrakesoft.com> 4.2-23mdk
+- fixed bug 2342 (reported exit code 9 for rpm db access failure)
+
 * Fri Feb 21 2003 François Pons <fpons@mandrakesoft.com> 4.2-22mdk
 - fixed callback not sent with wget if a file is not downloaded.
 - fixed rsync:// protocol to support :port inside url.
-- 
cgit v1.2.1