Permalink
Browse files

fix bug 531873 (maemo multi-locale factory adds more steps to itself …

…every time) -- r=pike
  • Loading branch information...
1 parent 9ced5db commit 6e72b81270487c7ed793bd657b09bcc00b7db268 @escapewindow escapewindow committed Dec 3, 2009
Showing with 4 additions and 0 deletions.
  1. +4 −0 process/factory.py
View
4 process/factory.py
@@ -4159,6 +4159,8 @@ def __init__(self, baseBuildDir, scratchboxPath="/scratchbox/moz_scratchbox",
# This will package the en-US single-locale build (no xulrunner)
self.addPackageSteps()
self.doUpload()
+ self.useProgress = False
+ self.nonMultiLocaleStepsLength = len(self.steps)
else: # Normal single-locale nightly like Electrolysis and Tracemonkey
self.addBuildSteps()
self.addPackageSteps(packageXulrunner=True)
@@ -4289,6 +4291,8 @@ def addMultiLocaleSteps(self, requests, propertyName):
req = requests[-1]
# get the list of locales that has been added by the scheduler
locales = req.properties.getProperty(propertyName)
+ # Drop all previous multi-locale steps, to fix bug 531873.
+ self.steps = self.steps[:self.nonMultiLocaleStepsLength]
# remove all packages that have been created by the single locale build
self.addStep(ShellCommand,
name='rm_packages',

0 comments on commit 6e72b81

Please sign in to comment.