Call function to send direct mail. Send mail ourselves to list rather than as

piped output to /bin/mail

1 files changed, 27 insertions, 15 deletions

diff --git a/scripts/check-upgrade-paths.py b/scripts/check-upgrade-paths.py
index 40bf1cd..8acd44b 100755
--- a/scripts/check-upgrade-paths.py
+++ b/scripts/check-upgrade-paths.py
@@ -134,30 +134,42 @@ for pkg in pkgdict:
                         badpaths[pkg].append('%s > %s (%s %s)' % (tag, nexttag, pkgdict[pkg][tag]['nvr'], pkgdict[pkg][nexttag]['nvr']))
                         badpathsbybuilder[pkgdict[pkg][tag]['builder']][pkg].append('%s > %s (%s %s)' % (tag, nexttag, pkgdict[pkg][tag]['nvr'], pkgdict[pkg][nexttag]['nvr']))
 
-# TODO We should print ownership here
-print """Broken upgrade path report for tags %s""" % tags
-print "\n"
+msg = """From: %s
+To: %s
+Subject: Package EVR problems in Fedora %s
+
+""" % (fromaddr, toaddr, datetime.date.today())
+msg += "Broken upgrade path report for tags %s:\n" % ' -> '.join(tags)
+
 pkgs = badpaths.keys()
 pkgs.sort()
 for pkg in pkgs:
-    print "%s:" % pkg
+    msg += "%s:\n" % pkg
     for path in badpaths[pkg]:
-        print "    %s" % path
-    print "\n"
+        msg += "    %s\n" % path
+    msg += "\n"
 
-print "-----------------------\n"
-print "Broken paths by builder:\n"
+msg += "-----------------------\n"
+msg += "Broken paths by builder:\n"
 builders = badpathsbybuilder.keys()
 builders.sort()
 for builder in builders:
-    print "%s:" % builder
+    msg += "%s:\n" % builder
     pkgs = badpathsbybuilder[builder].keys()
     pkgs.sort()
     for pkg in pkgs:
-        print "    %s:" % pkg
+        genPackageMail(builder, pkg)
+        msg += "    %s:\n" % pkg
         for path in badpathsbybuilder[builder][pkg]:
-            print "        %s" % path
-    print "\n"
-
-print "---------------"
-print "This report generated by Fedora Release Engineering, using http://git.fedorahosted.org/git/?p=releng;a=blob;f=scripts/check-upgrade-paths.py;hb=HEAD"
+            msg += "        %s\n" % path
+    msg += "\n"
+
+msg += "---------------\n"
+msg += "This report generated by Fedora Release Engineering, using http://git.fedorahosted.org/git/?p=releng;a=blob;f=scripts/check-upgrade-paths.py;hb=HEAD"
+
+try:
+    server = smtplib.SMTP(smtpserver)
+    server.set_debuglevel(1)
+    server.sendmail(fromaddr, toaddr, msg)
+except:
+    print 'sending mail failed'