extras-buildsys/utils/pushscript Push.py,1.54,1.55

Michael Schwendt mschwendt at fedoraproject.org
Wed Nov 5 13:02:10 UTC 2008


Author: mschwendt

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

Modified Files:
	Push.py 
Log Message:
- create needsign rootdir (for repolock) if it doesn't exit
- fix the locktype= option check



Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- Push.py	29 Sep 2008 15:54:07 -0000	1.54
+++ Push.py	5 Nov 2008 13:02:10 -0000	1.55
@@ -225,8 +225,10 @@
     Utils.make_std_repodirs(cfg,dist,destroot)
     
     repolockname = os.path.join(needsignroot,REPO_LOCKFILE_NAME)
+    if not os.path.exists(repolockname):
+        os.makedirs(os.path.dirname(repolockname))
     locktype = 'flock'
-    if cfg.opts.hasattr('locktype'):
+    if hasattr(cfg.opts,'locktype'):
         locktype = cfg.opts.locktype
     repolock = LockFile(name=repolockname,blocking=True,type=locktype)
     try:
@@ -235,7 +237,7 @@
         repolock.lock()
         print 'OK'
     except IOError, (err, strerr):
-        print "ERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, err)
+        print "\nERROR: lockfile %s failure: %s (error %d)" % (repolockname, strerr, err)
         sys.exit(err)
         
     bs = LocalPlague(needsignroot, cfg.createrepo)




More information about the fedora-extras-commits mailing list