[or-cvs] r22530: {projects} Make GetTor not choke anymore when building the new TBB Linu (projects/gettor/lib/gettor)

[Christian Fromme]

Author: kaner
Date: 2010-06-22 19:36:20 +0000 (Tue, 22 Jun 2010)
New Revision: 22530

Modified:
   projects/gettor/lib/gettor/packages.py
   projects/gettor/lib/gettor/utils.py
Log:
Make GetTor not choke anymore when building the new TBB Linux packages (Thanks Erinn for the heads up)


Modified: projects/gettor/lib/gettor/packages.py
===================================================================
--- projects/gettor/lib/gettor/packages.py	2010-06-22 15:47:59 UTC (rev 22529)
+++ projects/gettor/lib/gettor/packages.py	2010-06-22 19:36:20 UTC (rev 22530)
@@ -56,32 +56,32 @@
                      "windows-bundle": ("vidalia-bundle-.*.exe$", "vidalia-bundle-.*_split"),
                      "macosx-ppc-bundle": ("vidalia-bundle-.*-ppc.dmg$", "vidalia-bundle-.*-ppc_split"),
                      "macosx-i386-bundle": ("vidalia-bundle-.*-i386.dmg$", "vidalia-bundle-.*-universal_split"),
-                     "linux-browser-bundle-i386": ("i386-tor-browser-gnu-linux-.*-en-US.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_en": ("i386-tor-browser-gnu-linux-.*-en-US.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_ar": ("i386-tor-browser-gnu-linux-.*-ar.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_de": ("i386-tor-browser-gnu-linux-.*-de.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_es-ES": ("i386-tor-browser-gnu-linux-.*-es-ES.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_fa": ("i386-tor-browser-gnu-linux-.*-fa.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_fr": ("i386-tor-browser-gnu-linux-.*-fr.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_it": ("i386-tor-browser-gnu-linux-.*-it.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_nl": ("i386-tor-browser-gnu-linux-.*-nl.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_pl": ("i386-tor-browser-gnu-linux-.*-pl.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_pt_PT": ("i386-tor-browser-gnu-linux-.*-pt_PT.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_ru": ("i386-tor-browser-gnu-linux-.*-ru.tar.gz$", "not available"),
-                     "linux-browser-bundle-i386_zh_CN": ("i386-tor-browser-gnu-linux-.*-zh-CN.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64": ("x86_64-tor-browser-gnu-linux-.*-en-US.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_en": ("x86_64-tor-browser-gnu-linux-.*-en-US.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_ar": ("x86_64-tor-browser-gnu-linux-.*-ar.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_de": ("x86_64-tor-browser-gnu-linux-.*-de.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_es-ES": ("x86_64-tor-browser-gnu-linux-.*-es-ES.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_fa": ("x86_64-tor-browser-gnu-linux-.*-fa.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_fr": ("x86_64-tor-browser-gnu-linux-.*-fr.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_it": ("x86_64-tor-browser-gnu-linux-.*-it.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_nl": ("x86_64-tor-browser-gnu-linux-.*-nl.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_pl": ("x86_64-tor-browser-gnu-linux-.*-pl.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_pt_PT": ("x86_64-tor-browser-gnu-linux-.*-pt_PT.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_ru": ("x86_64-tor-browser-gnu-linux-.*-ru.tar.gz$", "not available"),
-                     "linux-browser-bundle-x86_64_zh_CN": ("x86_64-tor-browser-gnu-linux-.*-zh-CN.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386": ("tor-browser-gnu-linux-i686-.*-en-US.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_en": ("tor-browser-gnu-linux-i686-.*-en-US.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_ar": ("tor-browser-gnu-linux-i686-.*-ar.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_de": ("tor-browser-gnu-linux-i686-.*-de.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_es-ES": ("tor-browser-gnu-linux-i686-.*-es-ES.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_fa": ("tor-browser-gnu-linux-i686-.*-fa.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_fr": ("tor-browser-gnu-linux-i686-.*-fr.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_it": ("tor-browser-gnu-linux-i686-.*-it.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_nl": ("tor-browser-gnu-linux-i686-.*-nl.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_pl": ("tor-browser-gnu-linux-i686-.*-pl.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_pt_PT": ("tor-browser-gnu-linux-i686-.*-pt_PT.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_ru": ("tor-browser-gnu-linux-i686-.*-ru.tar.gz$", "not available"),
+                     "linux-browser-bundle-i386_zh_CN": ("tor-browser-gnu-linux-i686-.*-zh-CN.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64": ("tor-browser-gnu-linux-x86_64-.*-en-US.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_en": ("tor-browser-gnu-linux-x86_64-.*-en-US.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_ar": ("tor-browser-gnu-linux-x86_64-.*-ar.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_de": ("tor-browser-gnu-linux-x86_64-.*-de.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_es-ES": ("tor-browser-gnu-linux-x86_64-.*-es-ES.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_fa": ("tor-browser-gnu-linux-x86_64-.*-fa.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_fr": ("tor-browser-gnu-linux-x86_64-.*-fr.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_it": ("tor-browser-gnu-linux-x86_64-.*-it.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_nl": ("tor-browser-gnu-linux-x86_64-.*-nl.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_pl": ("tor-browser-gnu-linux-x86_64-.*-pl.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_pt_PT": ("tor-browser-gnu-linux-x86_64-.*-pt_PT.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_ru": ("tor-browser-gnu-linux-x86_64-.*-ru.tar.gz$", "not available"),
+                     "linux-browser-bundle-x86_64_zh_CN": ("tor-browser-gnu-linux-x86_64-.*-zh-CN.tar.gz$", "not available"),
                      # Mike won't sign Torbutton; He doesn't get gettor support
                      #"torbutton": "torbutton-current.xpi$",
                    }

Modified: projects/gettor/lib/gettor/utils.py
===================================================================
--- projects/gettor/lib/gettor/utils.py	2010-06-22 15:47:59 UTC (rev 22529)
+++ projects/gettor/lib/gettor/utils.py	2010-06-22 19:36:20 UTC (rev 22530)
@@ -134,7 +134,7 @@
     except IOError:
         log.error("Error initiating package list.")
         return False
-    packs.preparePackages()
+    #packs.preparePackages()
     if not packs.buildPackages():
         log.error("Building packages failed.")
         return False