Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

merging default -> production for bug 684086

--HG--
branch : production-0.8
  • Loading branch information...
commit bc4dc08cf7da0f446ead2e815ea31bcff6af924d 2 parents ad8f2fd + 25623c9
@escapewindow escapewindow authored
Showing with 2 additions and 15 deletions.
  1. +1 −3 bin/try_mailer.py
  2. +1 −12 process/factory.py
View
4 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:
View
13 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):
Please sign in to comment.
Something went wrong with that request. Please try again.