extras-buildsys/utils/pushscript Push.py,1.19,1.20
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Thu Nov 30 10:56:49 UTC 2006
Author: mschwendt
Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4987
Modified Files:
Push.py
Log Message:
trying something
Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- Push.py 25 Nov 2006 21:07:43 -0000 1.19
+++ Push.py 30 Nov 2006 10:56:49 -0000 1.20
@@ -24,7 +24,7 @@
import tempfile
import time
-import Utils, MultiLib, Comps
+import Utils, MultiLib, Comps, WhatsNew
import RepoBuild, RepoPrune, RepoView
DEBUG = False
@@ -365,7 +365,17 @@
if not os.path.exists(destloc):
rollback.append(destloc)
Utils.install_move(package,destloc)
- buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+ if WhatsNew.get(dist,name):
+ buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+ else:
+ tmp1 = '%s-%s-%s' % (n,v,r)
+ tmp1len = len(tmp1)
+ linelen = 66
+ if tmp1len < linelen:
+ buildreportinfo = tmp1+' '*(linelen-tmp1len)
+ else:
+ buildreportinfo = tmp1+' '
+ buildreportinfo += 'NEW\n'
else: # src.rpm published before, exclude entire build job
mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
buildreportinfo = 'Invalid rebuild: %s-%s\n' % (name,os.path.basename(pkgrelroot))
@@ -487,6 +497,8 @@
repolock.unlock()
try:
+ WhatsNew.load(cfg.rundir)
+
print "Signing Packages:"
rv = sign_pkgs( find_files(signtmpdir,'*.rpm') )
if rv:
@@ -515,6 +527,9 @@
print e
except rpmUtils.RpmUtilsError, e:
print e
+ WhatsNew.set(dist,name)
+
+ WhatsNew.save(cfg.rundir)
except:
shutil.rmtree(signtmpdir)
raise
More information about the scm-commits
mailing list