From 276fdb3a35563ffe831d21bd68b825c0c2318e30 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 11 Feb 2009 16:07:24 +0000
Subject: (harvester) only warn about locked urpmi DB after 10 tries

(maybe this should be made configurable in config file?)
---
 NEWS      |  1 +
 mdkapplet | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 3937f8fd..b83720eb 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
 - mdkapplet
   o do not hide urpmi.update arguments (#47002)
   o be nicer with CPU (more efficient system power usage)
+  o only warn about locked urpmi DB after 10 tries
 
 Version 2.72 - 16 December 2008
 
diff --git a/mdkapplet b/mdkapplet
index 1d47b90b..73117c68 100755
--- a/mdkapplet
+++ b/mdkapplet
@@ -124,6 +124,12 @@ my %state = (
 		      menu => [ 'check' ],
                 tt => [ N_("urpmi database locked") ],
  		      do_not_use_bubble => 1,
+          },
+          loop_locked => {
+		      colour => [ 'noconf' ],
+		      changes => [ 'okay', 'busy', 'critical', 'disconnected' ],
+		      menu => [ 'check' ],
+                tt => [ N_("urpmi database locked") ],
           },
 	     notsupported => {
 		      colour => [ 'disabled' ],
@@ -321,7 +327,7 @@ sub is_there_a_new_distributions() {
 }
 
 
-my ($mdv_update_pid, $checker_pid, $media_manager_pid);
+my ($mdv_update_pid, $checker_pid, $media_manager_pid, $locked_count);
 
 # Signal management 
 sub harvester {
@@ -344,6 +350,12 @@ sub harvester {
                       && $local_config{DO_NOT_ASK_FOR_DISTRO_UPGRADE} !~ /^true$/i) {
                     go2State('new_distribution');
                 } else {
+                    if ($sub_state eq 'locked') {
+                        $locked_count++;
+                        $sub_state = 'loop_locked' if $locked_count > 10;
+                    } else {
+                        $locked_count = 0;
+                    }
                     go2State($sub_state);
                 }
             }
-- 
cgit v1.2.1