From acf1ea7afffae0f5b8aa2e857e258ad6eb328958 Mon Sep 17 00:00:00 2001
From: Narayan Desai <desai@mcs.anl.gov>
Date: Fri, 29 Sep 2006 01:34:26 +0000
Subject: Fix RPM.Refresh when rpm is already in use (Resolves Ticket #134)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2342 ce84e21b-d406-0410-9b95-82705330c041
---
 src/lib/Client/Redhat.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/lib/Client/Redhat.py b/src/lib/Client/Redhat.py
index 848219b98..342f642e5 100644
--- a/src/lib/Client/Redhat.py
+++ b/src/lib/Client/Redhat.py
@@ -32,8 +32,13 @@ class ToolsetImpl(Toolset):
         '''Refresh memory hashes of packages'''
         self.installed = {}
         for line in self.saferun("rpm -qa --qf '%{NAME} %{VERSION}-%{RELEASE}\n'")[1]:
-            (name, version) = line.split()
-            self.installed[name] = version
+            try:
+                (name, version) = line.split()
+                self.installed[name] = version
+            except ValueError:
+                self.logger.error("RPM database already in use; waiting 30 seconds and retrying")
+                time.sleep(30)
+                return self.Refresh()
 
     def VerifyService(self, entry):
         '''Verify Service status for entry'''
-- 
cgit v1.2.3-1-g7c22