[yum-cvs] yum yum-updatesd.py, 1.22.2.4, 1.22.2.5 yummain.py, 1.100, 1.100.2.1

[James Bowes]

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

Modified Files:
      Tag: yum-3_0_X
	yum-updatesd.py yummain.py 
Log Message:
Provide a default file name for doLock and doUnlock

Index: yum-updatesd.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum-updatesd.py,v
retrieving revision 1.22.2.4
retrieving revision 1.22.2.5
diff -u -r1.22.2.4 -r1.22.2.5
--- yum-updatesd.py	8 Nov 2006 15:31:48 -0000	1.22.2.4
+++ yum-updatesd.py	24 Nov 2006 18:14:25 -0000	1.22.2.5
@@ -58,7 +58,6 @@
 sys.path.append('/usr/share/yum-cli')
 import callback
 
-YUM_PID_FILE = '/var/run/yum.pid'
 config_file = '/etc/yum/yum-updatesd.conf'
 
 
@@ -250,7 +249,7 @@
         self.updd.downloadPkgs(self.dlpkgs)
         self.updd.emitAvailable()
         self.updd.closeRpmDB()
-        self.updd.doUnlock(YUM_PID_FILE)
+        self.updd.doUnlock()
 
 class UpdateInstallThread(threading.Thread):
     def __init__(self, updd, dlpkgs):
@@ -261,12 +260,12 @@
     def failed(self, msgs):
         self.updd.emitUpdateFailed(msgs)
         self.updd.closeRpmDB()
-        self.updd.doUnlock(YUM_PID_FILE)
+        self.updd.doUnlock()
 
     def success(self):
         self.updd.emitUpdateApplied()
         self.updd.closeRpmDB()
-        self.updd.doUnlock(YUM_PID_FILE)
+        self.updd.doUnlock()
 
         self.updd.updateInfo = None
         self.updd.updateInfoTime = None        
@@ -329,7 +328,7 @@
         self.doConfigSetup(fn=self.opts.yum_config)
 
     def refreshUpdates(self):
-        self.doLock(YUM_PID_FILE)
+        self.doLock()
         try:
             self.doRepoSetup()
             self.doSackSetup()
@@ -340,7 +339,7 @@
             syslog.syslog(syslog.LOG_WARNING,
                           "error getting update info: %s" %(e,))
             self.emitCheckFailed("%s" %(e,))
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
             return False
         return True
 
@@ -462,13 +461,13 @@
                 self.emitAvailable()
         except Exception, e:
             self.emitCheckFailed("%s" %(e,))
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
 
         # FIXME: this is kind of ugly in that I want to do it sometimes
         # and yet not others and it's from threads that it matters.  aiyee!
         if close:
             self.closeRpmDB()
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
 
         return True
 
@@ -483,7 +482,7 @@
         tries = 0
         while tries < 10:
             try:
-                self.doLock(YUM_PID_FILE)
+                self.doLock()
                 break
             except yum.Errors.LockError:
                 pass
@@ -493,7 +492,7 @@
             time.sleep(1)
             tries += 1
         if tries == 10:
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
             return []
 
         try:
@@ -504,9 +503,9 @@
             self.populateUpdates()
 
             self.closeRpmDB()
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
         except:
-            self.doUnlock(YUM_PID_FILE)
+            self.doUnlock()
 
         return self.updateInfo
 

Index: yummain.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yummain.py,v
retrieving revision 1.100
retrieving revision 1.100.2.1
diff -u -r1.100 -r1.100.2.1
--- yummain.py	19 Aug 2006 20:03:35 -0000	1.100
+++ yummain.py	24 Nov 2006 18:14:25 -0000	1.100.2.1
@@ -26,7 +26,6 @@
 import cli
 
 from i18n import _
-from yum.constants import *
 
 
 def main(args):
@@ -62,7 +61,7 @@
     def unlock():
         try:
             base.closeRpmDB()
-            base.doUnlock(YUM_PID_FILE)
+            base.doUnlock()
         except Errors.LockError, e:
             sys.exit(200)
 
@@ -88,7 +87,7 @@
     except Errors.YumBaseError, e:
         exFatal(e)
     try:
-        base.doLock(YUM_PID_FILE)
+        base.doLock()
     except Errors.LockError, e:
         logger.critical('%s', e.msg)
         sys.exit(200)