[yum-cvs] yum yum-updatesd.py,1.12,1.13

[Jeremy Katz]

Update of /home/groups/yum/cvs/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv8840

Modified Files:
	yum-updatesd.py 
Log Message:
* ensure path for cli.py is present
* if there's an exception at any point in getting update info, be sure we 
  release the lock (rh#195797)


Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- yum-updatesd.py	13 Jun 2006 18:57:10 -0000	1.12
+++ yum-updatesd.py	19 Jun 2006 01:22:10 -0000	1.13
@@ -53,6 +53,7 @@
 from yum.update_md import UpdateMetadata
 
 # FIXME: is it really sane to use this from here?
+sys.path.append('/usr/share/yum-cli')
 import callback
 
 YUM_PID_FILE = '/var/run/yum.pid'
@@ -289,11 +290,15 @@
 
     def refreshUpdates(self):
         self.doLock(YUM_PID_FILE)
-        self.doRepoSetup()
-        self.doSackSetup()
-        self.doTsSetup()
-        self.doRpmDBSetup()
-        self.doUpdateSetup()
+        try:
+            self.doRepoSetup()
+            self.doSackSetup()
+            self.doTsSetup()
+            self.doRpmDBSetup()
+            self.doUpdateSetup()
+        except Exception, e:
+            self.errorlog(0, "error getting update info: %s" %(e,))
+            self.doUnlock(YUM_PID_FILE)
 
     def populateUpdateMetadata(self):
         self.updateMetadata = UpdateMetadata()