Permalink
Browse files

Merging from default

changeset:   2840:b46a5d393b0b
tag:         tip
parent:      2838:1581c6ae51d8
user:        Ben Hearsum <bhearsum@mozilla.com>
date:        Tue Dec 04 13:20:05 2012 -0500
summary:     bug 812836: Set up nightly multilocale B2G desktop builds for dev+l10n testing - don't set file properties for MercurialBuildFactory based b2g builds. r=aki

--HG--
branch : production-0.8
  • Loading branch information...
2 parents 9dab14b + 4b44e36 commit 30eb923df517b33291ac766ef6237fa075ec5583 @rail rail committed Dec 4, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 process/factory.py
View
@@ -1695,7 +1695,7 @@ def addPackageSteps(self, pkgArgs=None, pkgTestArgs=None):
# Get package details
self.packageFilename = self.getPackageFilename(self.platform,
self.platform_variation)
- if self.packageFilename and 'rpm' not in self.platform_variation and self.productName != 'xulrunner':
+ if self.packageFilename and 'rpm' not in self.platform_variation and self.productName not in ('xulrunner', 'b2g'):
self.addFilePropertiesSteps(filename=self.packageFilename,
directory='build/%s/dist' % self.mozillaObjdir,
fileType='package',

0 comments on commit 30eb923

Please sign in to comment.