Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
  • Loading branch information...
commit 9f36198c767fe121bf04abd8051cdbc904f4f013 2 parents e336561 + 15a500f
ccooper authored August 31, 2012

Showing 1 changed file with 22 additions and 1 deletion. Show diff stats Hide diff stats

  1. 23  process/factory.py
23  process/factory.py
@@ -2270,6 +2270,15 @@ def addCreatePartialUpdateSteps(self, extraArgs=None):
2270 2270
             workdir='.',
2271 2271
             haltOnFailure=True,
2272 2272
         ))
  2273
+        for dir in ['current', 'previous']:
  2274
+            self.addStep(ShellCommand(
  2275
+                    name='remove pgc files (%s)' % dir,
  2276
+                    command="find . -name \*.pgc -print -delete",
  2277
+                    env=updateEnv,
  2278
+                    workdir="%s/%s" % (self.absMozillaObjDir, dir),
  2279
+                    flunkOnFailure=False,
  2280
+                    haltOnFailure=False,
  2281
+            ))
2273 2282
         # Generate the partial patch from the two unpacked complete mars.
2274 2283
         partialMarCommand=self.makeCmd + ['-C',
2275 2284
                            'tools/update-packaging', 'partial-patch',
@@ -2686,6 +2695,15 @@ def addCreatePartialUpdateSteps(self):
2686 2695
                 workdir='%s/previous' % self.absMozillaObjDir,
2687 2696
                 haltOnFailure=True,
2688 2697
             ))
  2698
+            for dir in ['current', 'previous']:
  2699
+                self.addStep(ShellCommand(
  2700
+                    name='remove pgc files (%s)' % dir,
  2701
+                    command="find . -name \*.pgc -print -delete",
  2702
+                    env=updateEnv,
  2703
+                    workdir="%s/%s" % (self.absMozillaObjDir, dir),
  2704
+                    flunkOnFailure=False,
  2705
+                    haltOnFailure=False,
  2706
+                ))
2689 2707
             self.addStep(ShellCommand(
2690 2708
                 name='make_partial_mar',
2691 2709
                 description=self.makeCmd + ['partial', 'mar'],
@@ -3168,6 +3186,9 @@ def getSources(self):
3168 3186
                 )
3169 3187
         self.addStep(step)
3170 3188
 
  3189
+        mirrors=[]
  3190
+        if self.baseMirrorUrls:
  3191
+            mirrors = [WithProperties(url + "/" + self.l10nRepoPath + "/%(locale)s") for url in self.baseMirrorUrls]
3171 3192
         step = self.makeHgtoolStep(
3172 3193
                 name='get_locale_src',
3173 3194
                 rev=WithProperties("%(l10n_revision)s"),
@@ -3176,7 +3197,7 @@ def getSources(self):
3176 3197
                 workdir='%s/%s' % (self.baseWorkDir, self.l10nRepoPath),
3177 3198
                 locks=[hg_l10n_lock.access('counting')],
3178 3199
                 use_properties=False,
3179  
-                mirrors=[],
  3200
+                mirrors=mirrors,
3180 3201
                 )
3181 3202
         self.addStep(step)
3182 3203
 

0 notes on commit 9f36198

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