extras-buildsys/utils/pushscript Push.py,1.18,1.19

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	Push.py 
Log Message:
skip bad rpms and improve status output in such an error condition


Index: Push.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/pushscript/Push.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Push.py	24 Nov 2006 22:22:46 -0000	1.18
+++ Push.py	25 Nov 2006 21:07:43 -0000	1.19
@@ -234,7 +234,11 @@
 def naevr(pkg):
     """return nevra from the package srpm"""
 
-    hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    try:
+        hdr = rpmUtils.miscutils.hdrFromPackage(ts, pkg)
+    except rpmUtils.RpmUtilsError:
+        print 'WARNING: %s is BAD' % pkg
+        raise
     name = hdr['name']
     ver = hdr['version']
     rel = hdr['release']
@@ -506,8 +510,11 @@
                     targetroot = destroot
                 try:
                     push(dist,needsignroot,targetroot,name,pkgrelroot,buildreport)
+                # TODO: report these via mail (or so)
                 except PushWarning, e:
                     print e
+                except rpmUtils.RpmUtilsError, e:
+                    print e
     except:
         shutil.rmtree(signtmpdir)
         raise