merging default -> production for bug 684086

--HG-- branch : production-0.8
mozilla-releng · Sep 1, 2011 · bc4dc08 · bc4dc08
2 parents ad8f2fd + 25623c9
commit bc4dc08
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 15 deletions.
diff --git a/bin/try_mailer.py b/bin/try_mailer.py
@@ -187,9 +187,7 @@ def formatMessage(msgdict, from_, to):
     # else default is failures only
     msgdict = None
     # Generate the message
-    if tm_options.silence:
-        print "No email going out for this result: %s (silence=%s)" % (result, tm_options.silence)
-    else:
+    if not tm_options.silence:
         if tm_options.all_emails:
             msgdict = makeTryMessage(build, log_url)
         else:

diff --git a/process/factory.py b/process/factory.py
@@ -1072,11 +1072,6 @@ def addBuildInfoSteps(self):
                 description=['getting', 'sourcestamp'],
                 descriptionDone=['got', 'sourcestamp']
             ))
-            self.addStep(SetBuildProperty(
-                name='set_comments',
-                property_name="comments",
-                value=lambda build:(build.source.changes[-1].comments),
-            ))
             self._gotBuildInfo = True
 
     def addBuildAnalysisSteps(self):
@@ -1942,7 +1937,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
              revision=WithProperties('%(got_revision)s'),
              files=[WithProperties('%(packageUrl)s')],
              user=WithProperties('%(who)s'),
-             comments=WithProperties('%(comments)s'),
              sendchange_props=sendchange_props,
             ))
         for master, warn, retries in self.unittestMasters:
@@ -1956,7 +1950,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
              files=[WithProperties('%(packageUrl)s'),
                      WithProperties('%(testsUrl)s')],
              user=WithProperties('%(who)s'),
-             comments=WithProperties('%(comments)s'),
              sendchange_props=sendchange_props,
             ))
 
@@ -2518,7 +2511,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
                  revision=WithProperties("%(got_revision)s"),
                  files=[WithProperties('%(packageUrl)s')],
                  user="sendchange",
-                 comments=WithProperties('%(comments)s'),
                  sendchange_props=sendchange_props,
                 ))
 
@@ -2536,7 +2528,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
                  revision=WithProperties("%(got_revision)s"),
                  files=files,
                  user="sendchange-unittest",
-                 comments=WithProperties('%(comments)s'),
                  sendchange_props=sendchange_props,
                 ))
 
@@ -2697,7 +2688,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
              revision=WithProperties("%(got_revision)s"),
              files=[WithProperties('%(packageUrl)s')],
              user="sendchange",
-             comments=WithProperties('%(comments)s'),
              sendchange_props=sendchange_props,
             ))
 
@@ -2712,7 +2702,6 @@ def doUpload(self, postUploadBuildDir=None, uploadMulti=False):
              files=[WithProperties('%(packageUrl)s'),
                     WithProperties('%(testsUrl)s')],
              user="sendchange-unittest",
-             comments=WithProperties('%(comments)s'),
              sendchange_props=sendchange_props,
             ))
 
@@ -5538,7 +5527,7 @@ def doUpload(self):
                  revision=WithProperties('%(got_revision)s'),
                  branch=self.unittestBranch,
                  files=[WithProperties('%(packageUrl)s')],
-                 user=WithProperties('%(who)s')),
+                 user=WithProperties('%(who)s'))
                 )
 
 class CCUnittestBuildFactory(MozillaBuildFactory):