[Pkg-privacy-commits] [tails-installer] 65/70: Properly identify too small devices.

Ulrike Uhlig ulrike at moszumanska.debian.org
Mon Nov 20 14:55:06 UTC 2017


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 f7c6df3d6e0d9def91cca89f7e43f70f92dfb706
Author: anonym <anonym at riseup.net>
Date:   Wed Sep 20 15:40:54 2017 +0200

    Properly identify too small devices.
    
    I cannot pretend to understand why the previous condition was supposed
    to work. Any way, it didn't work for isohybrid's, but this new
    condition does, while being more self-explaining.
---
 tails_installer/creator.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 8b7c68e..6b23249 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -663,9 +663,11 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
             else:
                 parent_block = None
 
-            # Check for devices that are too small
-            if parent_block is None \
-               and not self.is_device_big_enough_for_installation(data['size']):
+            # Check for devices that are too small. Note that we still
+            # allow devices that can be upgraded for supporting legacy
+            # installations.
+            if not self.is_device_big_enough_for_installation(data['size']) and \
+               not self.device_can_be_upgraded(data):
                 self.log.warning('Skipping too small device: %s' % data['device'])
                 data['is_device_big_enough_for_installation'] = False
 

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



More information about the Pkg-privacy-commits mailing list