update logic to accomodate product 'thunderbird-test'. Bug 747025 - B…

…uild Thunderbird in parallel on new systems. r=nthomas
mozilla-releng · Apr 20, 2012 · 15ea387 · 15ea387
1 parent fbf8b42
commit 15ea387
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/common.py b/common.py
@@ -33,7 +33,7 @@ def genBuildUID():
 
 def reallyShort(name, product=None):
     prefix = ''
-    if product == 'thunderbird':
+    if product != None and 'thunderbird' in product:
         prefix = 'tb-'
 
     mappings = {

diff --git a/process/factory.py b/process/factory.py
@@ -1362,7 +1362,7 @@ def addLeakTestStepsCommon(self, baseUrl, leakEnv, graphAndUpload):
         ))
 
         logdir = "%s/_leaktest" % self.mozillaObjdir
-        if self.stageProduct == 'thunderbird':
+        if 'thunderbird' in self.stageProduct:
             logdir = self.objdir
 
         self.addStep(ShellCommand(