Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge bugs 704028 and 697802 to production-0.8 branch

--HG--
branch : production-0.8
  • Loading branch information...
commit fda579b0c3e7218812bb9cae61afdb1652fbdba8 2 parents 91deaf7 + 17022d5
authored November 24, 2011
6  process/factory.py
@@ -4245,7 +4245,8 @@ def __init__(self, productName, version, baseTag, stagingServer,
4245 4245
                   self.bundleFile],
4246 4246
          workdir='.',
4247 4247
          description=['create bundle'],
4248  
-         haltOnFailure=True
  4248
+         haltOnFailure=True,
  4249
+         timeout=30*60 # 30 minutes
4249 4250
         ))
4250 4251
         self.addStep(ShellCommand(
4251 4252
          name='delete_metadata',
@@ -4269,7 +4270,8 @@ def __init__(self, productName, version, baseTag, stagingServer,
4269 4270
          workdir="%s/%s" % (self.mozillaSrcDir, self.mozillaObjdir),
4270 4271
          env=self.env,
4271 4272
          description=['make source-package'],
4272  
-         haltOnFailure=True
  4273
+         haltOnFailure=True,
  4274
+         timeout=30*60 # 30 minutes
4273 4275
         ))
4274 4276
         self.addStep(ShellCommand(
4275 4277
          name='mv_source-package',
14  steps/misc.py
@@ -41,6 +41,7 @@
41 41
 from buildbotcustom.steps.base import LoggingBuildStep, ShellCommand, \
42 42
   addRetryEvaluateCommand, RetryingShellCommand
43 43
 from buildbotcustom.common import genBuildID, genBuildUID
  44
+from buildbotcustom.try_parser import processMessage
44 45
 
45 46
 def errbackAfter(wrapped_d, timeout):
46 47
     # Thanks to Dustin!
@@ -404,8 +405,17 @@ def start(self):
404 405
             bb_cmd = ['buildbot', 'sendchange', '--master', self.master,
405 406
                       '--username', user, '--branch', branch,
406 407
                       '--revision', revision]
407  
-            if comments:
408  
-                bb_cmd.extend(['--comments', comments])
  408
+            if isinstance(comments, basestring):
  409
+                if re.search('try: ', comments, re.MULTILINE):
  410
+                    comments = 'try: ' + ' '.join(processMessage(comments))
  411
+                else:
  412
+                    try:
  413
+                        comments = comments.splitlines()[0]
  414
+                    except IndexError:
  415
+                        comments = ''
  416
+                comments = re.sub(r'[\r\n^<>|;&"\'%$]', '_', comments)
  417
+                if comments:
  418
+                    bb_cmd.extend(['--comments', comments])
409 419
 
410 420
             for key, value in sendchange_props:
411 421
                 bb_cmd.extend(['--property', '%s:%s' % (key, value)])

0 notes on commit fda579b

Please sign in to comment.
Something went wrong with that request. Please try again.