commit 155fcf696f587c9572336d1a48dbe1e82d217ca9 Author: Christian Fromme kaner@strace.org Date: Tue Aug 30 16:25:13 2011 +0200

Add the Tor Browser Bundle instead of Vidalia Bundle for macos-i386 Closes #3829 --- gettor.conf | 38 +++++++++++++++++++++++++++++++++++++- lib/gettor/filters.py | 3 ++- lib/gettor/packages.py | 2 -- 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/gettor.conf b/gettor.conf index 4b42105..93b8d68 100644 --- a/gettor.conf +++ b/gettor.conf @@ -96,7 +96,43 @@ PACKAGES = { ("vidalia-bundles/vidalia-bundle-*-ppc.dmg", "unavailable"), "macosx-i386": - ("vidalia-bundles/vidalia-bundle-*-i386.dmg", + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", + "unavailable"), + "macosx-i386_en": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-en-US.zip", + "unavailable"), + "macosx-i386_ar": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ar.zip", + "unavailable"), + "macosx-i386_de": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-de.zip", + "unavailable"), + "macosx-i386_es-ES": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-es-ES.zip", + "unavailable"), + "macosx-i386_fa": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fa.zip", + "unavailable"), + "macosx-i386_fr": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-fr.zip", + "unavailable"), + "macosx-i386_it": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-it.zip", + "unavailable"), + "macosx-i386_nl": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-nl.zip", + "unavailable"), + "macosx-i386_pl": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pl.zip", + "unavailable"), + "macosx-i386_pt": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-pt-PT.zip", + "unavailable"), + "macosx-i386_ru": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-ru.zip", + "unavailable"), + "macosx-i386_zh_CN": + ("torbrowser/osx/TorBrowser-*-dev-osx-i386-zh-CN.zip", "unavailable"), "linux-i386": ("torbrowser/linux/tor-browser-gnu-linux-i686-*-en-US.tar.gz", diff --git a/lib/gettor/filters.py b/lib/gettor/filters.py index 9825e8f..e902964 100644 --- a/lib/gettor/filters.py +++ b/lib/gettor/filters.py @@ -24,7 +24,8 @@ def doPackageHacks(packageName, locale): packageName = "windows" if packageName == "windows" \ or packageName == "linux-i386" \ - or packageName == "linux-x86_64": + or packageName == "linux-x86_64" \ + or packageName == "osx-i386": # "windows" => "windows_de" packageName += "_" + locale

diff --git a/lib/gettor/packages.py b/lib/gettor/packages.py index 9d42b55..2159a6a 100644 --- a/lib/gettor/packages.py +++ b/lib/gettor/packages.py @@ -215,8 +215,6 @@ class Packages: self.rsync += " " self.rsync += "--exclude='*current*'" self.rsync += " " - self.rsync += "--exclude='*osx*'" - self.rsync += " " self.rsync += "--exclude='*rpm*'" self.rsync += " " self.rsync += "--exclude='*privoxy*'"