Permalink
Browse files

merged from default

changeset:   2325:bd2f5b537ab5
parent:      2322:d61c24d02d97
user:        Chris AtLee <catlee@mozilla.com>
date:        Wed Dec 07 18:14:52 2011 -0500
summary:     Bug 509158: Reduce default token time to 2 hours. r=rail

changeset:   2326:bb4c5508b400
tag:         tip
user:        Chris AtLee <catlee@mozilla.com>
date:        Thu Dec 08 11:56:47 2011 -0500
summary:     Bug 509158: Fix last-complete-mar detection. r=rail

--HG--
branch : production-0.8
  • Loading branch information...
2 parents ca58f15 + 3ae90b8 commit e1b26d5f4dd03825b66ee4efb4f2730efdee5035 @catlee catlee committed Dec 8, 2011
Showing with 2 additions and 2 deletions.
  1. +1 −1 process/factory.py
  2. +1 −1 steps/signing.py
View
2 process/factory.py
@@ -2237,7 +2237,7 @@ def addCreatePartialUpdateSteps(self, extraArgs=None):
WithProperties('ssh -l %s -i ~/.ssh/%s %s ' % (self.stageUsername,
self.stageSshKey,
self.stageServer) +
- 'ls -1t %s | grep %s | head -n 1' % (self.latestDir,
+ 'ls -1t %s | grep %s$ | head -n 1' % (self.latestDir,
marPattern))
],
extract_fn=marFilenameToProperty(prop_name='previousMarFilename'),
View
2 steps/signing.py
@@ -45,7 +45,7 @@ class SigningServerAuthenication(StringDownload):
d = None
interrupted = False
- def __init__(self, servers, server_cert, duration=6*3600, attempts=5,
+ def __init__(self, servers, server_cert, duration=2*3600, attempts=5,
sleeptime=60, **kwargs):
kwargs['s'] = ''
StringDownload.__init__(self, **kwargs)

0 comments on commit e1b26d5

Please sign in to comment.