Switch to https for client/request handler server and between builders communication...

[projects/pld-builder.new.git] / PLD_Builder / wrap.py

diff --git a/PLD_Builder/wrap.py b/PLD_Builder/wrap.py
index 51a00c93bb142d6c68e6946ad1d59f732fe34a8e..b9809a3709f438e31684a6aad852e0c6378fcb96 100644 (file)
--- a/PLD_Builder/wrap.py
+++ b/PLD_Builder/wrap.py
@@ -13,14 +13,14 @@ import status
 
 try:
     import mailer
-    def sendmail(trace, status):
+    def sendmail(trace):
         m = mailer.Message()
-        m.set_headers(to = status.admin, cc = ("%s, %s" % status.email, status.builder_list), subject = "fatal python exception")
+        m.set_headers(to = status.admin, cc = "%s, %s" % (status.email, status.builder_list), subject = "fatal python exception")
         m.write("%s\n" % trace)
-        m.write("during: %s\n" % status)
+        m.write("during: %s\n" % status.get())
         m.send()
 except:
-    def sendmail(trace, status):
+    def sendmail(trace):
         # don't use mailer.py; it safer this way
         f = os.popen("/usr/sbin/sendmail -i -t", "w")
         f.write("""Subject: builder failure
@@ -51,6 +51,6 @@ def wrap(main):
         log.alert(s.getvalue())
         log.alert("during: %s" % status.get())
 
-        sendmail(s.getvalue(), status.get())
+        sendmail(s.getvalue())
 
         sys.exit(1)