[Pkg-privacy-commits] [tails-installer] 01/34: Remove the download→enabled config option.

[anonym]

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

anonym-tails-guest pushed a commit to branch tails/master
in repository tails-installer.

commit f16d961044ab9fdc4013937eee309c6097331ec5
Author: intrigeri <intrigeri at boum.org>
Date:   Sat Jan 20 07:25:07 2018 +0000

    Remove the download→enabled config option.
    
    We have never tested these code paths and most likely we broke
    them with the changes we've made in the last 5+ years.
    Let's simplify the logic of the code we care about.
    
    For now I'm leaving the actual downloading code around in case it may be useful
    some day. But removing it would allow us to drop the useless dependency on
    python-urlgrabber so perhaps we should do that at some point.
---
 tails_installer/config.py |  2 --
 tails_installer/gui.py    | 13 ++-----------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/tails_installer/config.py b/tails_installer/config.py
index fb03131..bec1f10 100644
--- a/tails_installer/config.py
+++ b/tails_installer/config.py
@@ -27,8 +27,6 @@ default_config = {
     'liveos_toplevel_files': [ 'autorun.bat', 'autorun.inf', 'boot', '.disk',
                                'doc', 'EFI', 'live', 'isolinux', 'syslinux',
                                'tmp', 'utils' ],
-    'download': { 'enabled': False,
-                },
     'persistence': { 'enabled': False,
                 },
     'branding': { 'distribution': 'Tails',
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index 221530d..ff848bd 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -324,10 +324,9 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             self.__radio_button_source_device.set_visible(False)
             self.__filechooserbutton_source_file.set_sensitive(True)
 
-        if self.opts.clone or config['download']['enabled']:
+        if self.opts.clone:
             self.source_available = True
-        if not config['download']['enabled']:
-            self.__box_source_dl.set_visible(False)
+        self.__box_source_dl.set_visible(False)
         self.update_start_button()
         self.live = TailsInstallerCreator(opts=opts)
         if self.opts.clone:
@@ -758,14 +757,6 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
         elif self.live.source.__class__ == LocalIsoSource:
             self.enable_widgets(False)
             self.live_thread.start()
-        # Else, download an ISO.
-        elif config['download']['enabled']:
-            self.downloader = ReleaseDownloader(
-                    self.downloadCombo.currentText(),
-                    progress=self.download_progress,
-                    proxies=self.live.get_proxies(),
-                    parent=self)
-            self.downloader.start()
         else:
             raise NotImplementedError
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/tails-installer.git