extras-buildsys/utils/pushscript PushPackage.py, 1.3, 1.4 ToStable.py, 1.7, 1.8 Push.py, 1.53, 1.54

[Michael Schwendt]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26161

Modified Files:
	PushPackage.py ToStable.py Push.py 
Log Message:
use newer LockFile module here


Index: PushPackage.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/PushPackage.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PushPackage.py	23 Aug 2007 12:04:13 -0000	1.3
+++ PushPackage.py	29 Sep 2008 15:54:07 -0000	1.4
@@ -18,7 +18,10 @@
 import errno, os, sys
 
 import Utils, Push
-from LockFile import LockFile
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 
 
 def main(cfg,args):


Index: ToStable.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/ToStable.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ToStable.py	19 Jan 2008 15:36:35 -0000	1.7
+++ ToStable.py	29 Sep 2008 15:54:07 -0000	1.8
@@ -20,7 +20,10 @@
 import rpmUtils.transaction, rpmUtils.miscutils
 
 import Utils, WhatsNew
-from LockFile import LockFile
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 from BuildReport import *
 
 ts = rpmUtils.transaction.initReadOnlyTransaction()


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- Push.py	20 Aug 2008 13:47:23 -0000	1.53
+++ Push.py	29 Sep 2008 15:54:07 -0000	1.54
@@ -27,7 +27,10 @@
 
 import Utils, MultiLib, Comps, WhatsNew, BlackList
 import RepoBuild, RepoPrune, RepoView
-from LockFile import LockFile, LockFileLocked
+try:
+    from plague.LockFile import LockFile, LockFileLocked
+except:
+    from LockFile import LockFile, LockFileLocked
 from BuildSys import LocalPlague
 from BuildReport import *
 
@@ -222,7 +225,10 @@
     Utils.make_std_repodirs(cfg,dist,destroot)
     
     repolockname = os.path.join(needsignroot,REPO_LOCKFILE_NAME)
-    repolock = LockFile(name=repolockname,blocking=True)
+    locktype = 'flock'
+    if cfg.opts.hasattr('locktype'):
+        locktype = cfg.opts.locktype
+    repolock = LockFile(name=repolockname,blocking=True,type=locktype)
     try:
         print 'Waiting for repository lock on %s:' % needsignroot,
         sys.stdout.flush()