From f3d40099ba0a142219474d9493453cc059dea0a8 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Sun, 24 Jul 2016 00:31:02 -0400
Subject: [PATCH] Setting extraRecipients before sending the message

---
 lib/config.json |  2 +-
 master.cfg      | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/config.json b/lib/config.json
index 9f30487..611562a 100644
--- a/lib/config.json
+++ b/lib/config.json
@@ -53,7 +53,7 @@
     "builders" : [ { "name" : "Fedora-x86_64-m64", "type" : "Plain_c64t64",
 		     "builddir" : "fedora-x86-64",
 		     "PATH" : "/usr/local/bin:/usr/bin:/bin",
-		     "tags" : [ "fedora", "x86_64", "m64", "MAIL" ],
+		     "tags" : [ "fedora", "x86_64", "m64", "MAIL", "TRY" ],
 		     "slavenames" : [ "fedora-x86-64-1", "fedora-x86-64-2",
 				      "fedora-x86-64-3", "fedora-x86-64-4" ] },
 
diff --git a/master.cfg b/master.cfg
index b3c0476..2a5e629 100644
--- a/master.cfg
+++ b/master.cfg
@@ -179,7 +179,7 @@ def SendRootMessageGDBTesters (branch, change, rev,
         text += "Commit tested against: %s\n\n" % rev
 
         text += "Patch tested:\n\n"
-        text += change.body
+        text += change
 
         chg_title = "Try Build against commit %s" % rev
         text = text.encode ('ascii', 'ignore').decode ('ascii')
@@ -198,7 +198,6 @@ def SendRootMessageGDBTesters (branch, change, rev,
     else:
         mail['To'] = try_to
         mailto = try_to
-        print "==== MEU MAILTO %s" % mailto
     mail['Message-Id'] = "<%s-try@gdb-build>" % rev
 
     s = smtplib.SMTP ('localhost')
@@ -416,7 +415,7 @@ send to the gdb-testers mailing list."""
     git_url = "http://gdb-build.sergiodj.net/cgit"
     branch = build.getSourceStamps ()[0].branch
     sourcestamp = build.getSourceStamps ()[0]
-    cur_change = sourcestamp.patch[0]
+    cur_change = sourcestamp.patch[1]
     properties = build.getProperties ()
     isrebuild = properties.getProperty ('isRebuild')
 
@@ -546,12 +545,13 @@ scheduler."""
         if prop.startswith ('racy'):
             return False
         elif prop.startswith ('try'):
-            if not self.sendToInterestedUsers:
+            if "TRY" not in self.tags:
                 # This means we're dealing with mn.  We only send
                 # e-mail on mn_try.
                 return False
+            self.extraRecipients = [ build.getReason ().strip ("'try' job by user ") ]
         else:
-            if self.sendToInterestedUsers:
+            if "TRY" in self.tags:
                 # We're dealing with mn_try.
                 return False
         return mail.MailNotifier.isMailNeeded (self, build, results)
@@ -570,7 +570,7 @@ mn_try = MyMailNotifier(fromaddr = GDB_MAIL_FROM,
                         sendToInterestedUsers = True,
                         mode = ( 'failing', 'passing', 'warnings' ),
                         messageFormatter = MessageGDBTestersTryBuild,
-                        tags = [ "MAIL" ],
+                        tags = [ "MAIL", "TRY"  ],
                         extraHeaders = { 'X-GDB-Buildbot' : '1',
                                          'In-Reply-To' : WithProperties ("<%s-try@gdb-build>",
                                                                          'got_revision') })