extras-buildsys/utils/pushscript Push.py,1.22,1.23

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/fedora/extras-buildsys/utils/pushscript
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11041

Modified Files:
	Push.py 
Log Message:
more beautiful and easier to the eyes?


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Push.py	2 Dec 2006 09:08:40 -0000	1.22
+++ Push.py	11 Dec 2006 13:10:14 -0000	1.23
@@ -350,7 +350,7 @@
 
     if len(filedict['srpm']) > 1:
         mark_pkg_pushed( os.path.join(needsignroot,name,os.path.basename(pkgrelroot)) )
-        buildreportinfo = 'Invalid build results: %s-%s\n' % (name,os.path.basename(pkgrelroot))
+        buildreportinfo = '%s-%s : INVALID build results, not published! INV\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
@@ -366,19 +366,12 @@
         rollback.append(destloc)
         Utils.install_move(package,destloc)
         if WhatsNew.get(dist,name):
-            buildreportinfo = '%s-%s-%s\n' % (n,v,r)
+            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'
+            buildreportinfo = '%s-%s-%s NEW\n' % (n,v,r)
     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))
+        buildreportinfo = '%s-%s : INVALID rebuild, not published! INV\n' % (name,os.path.basename(pkgrelroot))
         if buildreport:
             rundirfile.write(buildreportinfo)
         rundirfile.close()
@@ -564,9 +557,15 @@
         uniqued.sort()
     
         body += "\nPackages built and released for %s %s: %s \n\n" % (cfg.project_hr, dist, len(uniqued))
-        for pkg in uniqued:
-            add = '    %s\n' % (pkg)
-            body += add
+        for p in uniqued:
+            if p.endswith(' NEW'):
+                p = p[:-4]
+                p = 'NEW  '+p
+            elif p.endswith(' INV'):
+                p = '(!)  '+p[:-4]
+            else:
+                p = '     '+p
+            body += p+'\n'
         body += '\n'
 
     if not body: