Merging from default

changeset: 2569:c246b38678be parent: 2567:0d97cd562e61 user: Chris Cooper <ccooper@deadsquid.com> date: Fri Aug 31 17:37:15 2012 -0400 summary: Bug 767745 - Set mirrors for l10n dep/nightly repacks - r=bhearsum changeset: 2570:93832dff28f6 tag: tip user: Chris Cooper <ccooper@deadsquid.com> date: Fri Aug 31 21:45:51 2012 -0400 summary: Bug 783784 - Remove .pgc files before creating the partial mar - r=aki --HG-- branch : production-0.8
mozilla-releng · Sep 1, 2012 · 9f36198 · 9f36198
2 parents e336561 + 15a500f
commit 9f36198
Showing 1 changed file with 22 additions and 1 deletion.
diff --git a/process/factory.py b/process/factory.py
@@ -2270,6 +2270,15 @@ def addCreatePartialUpdateSteps(self, extraArgs=None):
             workdir='.',
             haltOnFailure=True,
         ))
+        for dir in ['current', 'previous']:
+            self.addStep(ShellCommand(
+                    name='remove pgc files (%s)' % dir,
+                    command="find . -name \*.pgc -print -delete",
+                    env=updateEnv,
+                    workdir="%s/%s" % (self.absMozillaObjDir, dir),
+                    flunkOnFailure=False,
+                    haltOnFailure=False,
+            ))
         # Generate the partial patch from the two unpacked complete mars.
         partialMarCommand=self.makeCmd + ['-C',
                            'tools/update-packaging', 'partial-patch',
@@ -2686,6 +2695,15 @@ def addCreatePartialUpdateSteps(self):
                 workdir='%s/previous' % self.absMozillaObjDir,
                 haltOnFailure=True,
             ))
+            for dir in ['current', 'previous']:
+                self.addStep(ShellCommand(
+                    name='remove pgc files (%s)' % dir,
+                    command="find . -name \*.pgc -print -delete",
+                    env=updateEnv,
+                    workdir="%s/%s" % (self.absMozillaObjDir, dir),
+                    flunkOnFailure=False,
+                    haltOnFailure=False,
+                ))
             self.addStep(ShellCommand(
                 name='make_partial_mar',
                 description=self.makeCmd + ['partial', 'mar'],
@@ -3168,6 +3186,9 @@ def getSources(self):
                 )
         self.addStep(step)
 
+        mirrors=[]
+        if self.baseMirrorUrls:
+            mirrors = [WithProperties(url + "/" + self.l10nRepoPath + "/%(locale)s") for url in self.baseMirrorUrls]
         step = self.makeHgtoolStep(
                 name='get_locale_src',
                 rev=WithProperties("%(l10n_revision)s"),
@@ -3176,7 +3197,7 @@ def getSources(self):
                 workdir='%s/%s' % (self.baseWorkDir, self.l10nRepoPath),
                 locks=[hg_l10n_lock.access('counting')],
                 use_properties=False,
-                mirrors=[],
+                mirrors=mirrors,
                 )
         self.addStep(step)