pld-builder.new: PLD_Builder/wrap.py - fix variable collision

[glen]

Author: glen                         Date: Mon Feb 16 11:26:33 2009 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
- fix variable collision

---- Files affected:
pld-builder.new/PLD_Builder:
   wrap.py (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/wrap.py
diff -u pld-builder.new/PLD_Builder/wrap.py:1.9 pld-builder.new/PLD_Builder/wrap.py:1.10
--- pld-builder.new/PLD_Builder/wrap.py:1.9	Mon Feb 16 12:21:57 2009
+++ pld-builder.new/PLD_Builder/wrap.py	Mon Feb 16 12:26:28 2009
@@ -13,14 +13,14 @@
 
 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 @@
         log.alert(s.getvalue())
         log.alert("during: %s" % status.get())
 
-        sendmail(s.getvalue(), status.get())
+        sendmail(s.getvalue())
 
         sys.exit(1)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/wrap.py?r1=1.9&r2=1.10&f=u