[Pkg-anonymity-tools] [torbrowser-launcher] 02/48: remove old_update_check_url, and only use new URL now

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository torbrowser-launcher.

commit 4a52a233eecebab78f4a6df03c08522198f7725c
Author: Micah Lee <micah at micahflee.com>
Date:   Wed Sep 3 10:55:18 2014 -0700

    remove old_update_check_url, and only use new URL now
---
 torbrowser-launcher | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/torbrowser-launcher b/torbrowser-launcher
index 9ad2985..7bbbf01 100755
--- a/torbrowser-launcher
+++ b/torbrowser-launcher
@@ -67,10 +67,6 @@ class DownloadErrorException(Exception):
     pass
 
 
-class TryOldUpdateCheckException(Exception):
-    pass
-
-
 class VerifyTorProjectCert(ClientContextFactory):
 
     def __init__(self, torproject_pem):
@@ -187,7 +183,6 @@ class TBLCommon:
                 'download_dir': tbb_cache+'/download',
                 'gnupg_homedir': tbb_local+'/gnupg_homedir',
                 'settings_file': tbb_config+'/settings',
-                'old_update_check_url': 'https://check.torproject.org/RecommendedTBBVersions',
                 'update_check_url': 'https://www.torproject.org/projects/torbrowser/RecommendedTBBVersions',
                 'update_check_file': tbb_cache+'/download/RecommendedTBBVersions',
                 'tbb': {
@@ -780,10 +775,6 @@ class TBLLauncher:
             print _('Downloading'), self.common.paths['update_check_url']
             self.download('update check', self.common.paths['update_check_url'], self.common.paths['update_check_file'])
 
-        if task == 'download_old_update_check':
-            print _('Downloading'), self.common.paths['old_update_check_url']
-            self.download('update check', self.common.paths['old_update_check_url'], self.common.paths['update_check_file'])
-
         if task == 'attempt_update':
             print _('Checking to see if update is needed')
             self.attempt_update()
@@ -826,8 +817,6 @@ class TBLLauncher:
                 self.all_done = done_cb
 
                 if response.code != 200:
-                    if response.code == 404 and url == common.paths['update_check_url']:
-                        raise TryOldUpdateCheckException
                     if common.settings['mirror'] != common.default_mirror:
                         raise TryDefaultMirrorException(_("Download Error: {0} {1}\n\nYou are currently using a non-default mirror:\n{2}\n\nWould you like to switch back to the default?").format(response.code, response.phrase, common.settings['mirror']))
                     else:
@@ -895,13 +884,6 @@ class TBLLauncher:
             else:
                 self.set_gui('error', str(f.value), [], False)
 
-        elif isinstance(f.value, TryOldUpdateCheckException):
-            f.trap(TryOldUpdateCheckException)
-            print 'New update check URL failed, trying old'
-            self.set_gui('task', _("Checking for Tor Browser update."),
-                         ['download_old_update_check',
-                          'attempt_update'])
-
         elif isinstance(f.value, ResponseFailed):
             for reason in f.value.reasons:
                 if isinstance(reason.value, OpenSSL.SSL.Error):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git