From 7a7699c41d5c5f70bc1b0a1f9d120e72dfc30698 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.com>
Date: Tue, 20 Jun 2006 15:20:25 +0000
Subject: Remove old rpm db log files when restarting one self

---
 urpmi | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/urpmi b/urpmi
index 9df0a6f4..8b3542cb 100755
--- a/urpmi
+++ b/urpmi
@@ -308,6 +308,14 @@ select STDOUT; $| = 1;
 #- log is only for verbose runs.
 $verbose > 0 or $urpm->{log} = sub {};
 
+if (exists $urpm->{options}{'priority-upgrade'} && $urpm->{options}{'priority-upgrade'} eq '') {
+    # we were run with --no-priority-upgrade (we were just restarted.)
+    # so, no need to update the media again
+    $auto_update = 0;
+    # also, clean up rpm db log files, because rpm might have been upgraded
+    unlink </var/lib/rpm/__db.00?> unless $root;
+}
+
 unless ($env || $nolock) {
     $urpm->exlock_rpm_db;
     $urpm->shlock_urpmi_db;
@@ -331,9 +339,6 @@ my %config_hash = (
     usedistrib => $usedistrib,
 );
 
-if (exists $urpm->{options}{'priority-upgrade'} && $urpm->{options}{'priority-upgrade'} eq '') {
-    $auto_update = 0;
-}
 $root and $urpm->{options}{'priority-upgrade'} = '';
 if ($auto_update && !$bug && !$env) {
     #- For translators : there are several media here
-- 
cgit v1.2.1