[Pkg-privacy-commits] [tails-installer] 33/70: 9005 Improve tails installer: Fix check on small device and some minor GUI errors.

[Ulrike Uhlig]

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

ulrike pushed a commit to annotated tag tails-installer_4.20
in repository tails-installer.

commit fd13e431f5847dcef3ce2e0675c1ee8d184ed9cb
Author: Tails Developers <tails at boum.org>
Date:   Fri Aug 19 10:40:07 2016 +0200

    9005 Improve tails installer: Fix check on small device and some minor
    GUI errors.
---
 tails_installer/creator.py | 3 +--
 tails_installer/gui.py     | 5 ++++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 4683c3c..12093e5 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -644,8 +644,7 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
                 parent_block = None
 
             # Check for devices that are too small
-            if self.opts.partition and not parent_block \
-                  and not self.is_device_big_enough(data['size']):
+            if parent_block is None and not self.is_device_big_enough(data['size']):
                 self.log.warning('Skipping too small device: %s' % data['device'])
                 data['is_device_big_enough'] = False
 
diff --git a/tails_installer/gui.py b/tails_installer/gui.py
index e62dc60..8ed220c 100755
--- a/tails_installer/gui.py
+++ b/tails_installer/gui.py
@@ -429,6 +429,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
 
     def on_force_reinstall_clicked(self, button):
         self.force_reinstall = True
+        self.opts.partition = True
         self.__button_force_reinstall.set_visible(False)
         self.on_start_clicked(button)
 
@@ -495,7 +496,8 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
     def update_start_button(self):
         if self.source_available and self.target_available:
             self.__button_start.set_sensitive(True)
-            self.__button_force_reinstall.set_visible(True)
+            if not self.opts.partition:
+                self.__button_force_reinstall.set_visible(True)
         else:
             self.__button_start.set_sensitive(False)
             self.__button_force_reinstall.set_visible(False)
@@ -603,6 +605,7 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
             self.update_start_button()
         else:
             self.__button_start.set_sensitive(False)
+            self.__button_force_reinstall.set_visible(False)
         self.__box_source.set_sensitive(enabled)
         self.__combobox_source_dl.set_sensitive(enabled)
         self.__combobox_target.set_sensitive(enabled and not self.target_selected)

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