changeset: 1797:45adc44a0355

tag: tip parent: 1791:b5e9f5542d40 user: Alice Nodelman date: Wed Sep 21 06:11:38 2011 -0700 summary: bug 664728: update plugins used by Talos - download 64 bit flash for win764/fed64 only. r=bear --HG-- branch : production-0.8
mozilla-releng · Sep 21, 2011 · 277b280 · 277b280
2 parents e1c8e07 + 3a3b893
commit 277b280
Showing 1 changed file with 20 additions and 8 deletions.
diff --git a/process/factory.py b/process/factory.py
@@ -7313,14 +7313,26 @@ def addSetupSteps(self):
             ))
 
         if self.plugins:
-            self.addStep(DownloadFile(
+            #32 bit (includes mac browsers)
-             url="%s/%s" % (self.supportUrlBase, self.plugins),
+            if self.OS in ('xp', 'vista', 'win7', 'fedora', 'tegra_android', 'leopard', 'snowleopard', 'leopard-o'):
-             workdir=os.path.join(self.workdirBase, "talos/base_profile"),
+                self.addStep(DownloadFile(
-            ))
+                 url="%s/%s" % (self.supportUrlBase, self.plugins['32']),
-            self.addStep(UnpackFile(
+                 workdir=os.path.join(self.workdirBase, "talos/base_profile"),
-             filename=os.path.basename(self.plugins),
+                ))
-             workdir=os.path.join(self.workdirBase, "talos/base_profile"),
+                self.addStep(UnpackFile(
-            ))
+                 filename=os.path.basename(self.plugins['32']),
+                 workdir=os.path.join(self.workdirBase, "talos/base_profile"),
+                ))
+            #64 bit
+            if self.OS in ('w764', 'fedora64'):
+                self.addStep(DownloadFile(
+                 url="%s/%s" % (self.supportUrlBase, self.plugins['64']),
+                 workdir=os.path.join(self.workdirBase, "talos/base_profile"),
+                ))
+                self.addStep(UnpackFile(
+                 filename=os.path.basename(self.plugins['64']),
+                 workdir=os.path.join(self.workdirBase, "talos/base_profile"),
+                ))
 
         for pageset in self.pagesets:
             self.addStep(DownloadFile(