[Pkg-privacy-commits] [tails-installer] 01/02: Import the changes for #10731 as a quilt patch.

[Intrigeri]

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

intrigeri pushed a commit to branch tails/jessie
in repository tails-installer.

commit 722a1be0eb372961d90c4eb9df61335161c974d6
Author: intrigeri <intrigeri at boum.org>
Date:   Wed May 24 15:06:48 2017 +0000

    Import the changes for #10731 as a quilt patch.
    
    I'll revert this once there's been a new upstream release that includes
    these changes. Meanwhile, let's feed our QA system with them.
---
 debian/patches/10731.patch | 47 ++++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 2 files changed, 48 insertions(+)

diff --git a/debian/patches/10731.patch b/debian/patches/10731.patch
new file mode 100644
index 0000000..f97047e
--- /dev/null
+++ b/debian/patches/10731.patch
@@ -0,0 +1,47 @@
+diff --git a/tails_installer/creator.py b/tails_installer/creator.py
+index 71bbea4..95a4102 100755
+--- a/tails_installer/creator.py
++++ b/tails_installer/creator.py
+@@ -575,7 +575,6 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+ 
+     def detect_supported_drives(self, callback=None, force_partitions=False):
+         """ Detect all supported (USB and SDIO) storage devices using UDisks.
+-        Note that the removable bit is not checked.
+         """
+         mounted_parts = {}
+         self.drives = {}
+@@ -609,7 +608,13 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
+                 'size': drive.props.size,
+                 'mounted_partitions': set(),
+                 'is_device_big_enough': True,
++                'removable': drive.props.media_removable,
+             }
++
++            # Check non-removable drives
++            if not data['removable']:
++                self.log.debug('Skipping non-removable device: %s' % data['device'])
++
+             # Only pay attention to USB and SDIO devices, unless --force'd
+             iface = drive.props.connection_bus
+             if iface != 'usb' and iface != 'sdio' and self.opts.force != data['device']:
+diff --git a/tails_installer/gui.py b/tails_installer/gui.py
+index 5018bc7..10b75b3 100755
+--- a/tails_installer/gui.py
++++ b/tails_installer/gui.py
+@@ -483,6 +483,16 @@ class TailsInstallerWindow(Gtk.ApplicationWindow):
+                     'model':   info['model'],
+                     'details': details
+                 }
++                # Skip devices with non-removable bit enabled
++                if not info['removable']:
++                    message =_('The USB stick "%(pretty_name)s"'
++                               ' is configured as non-removable by its'
++                               ' manufacturer and Tails will fail to start on it.'
++                               ' Please try installing on a different model.') % {
++                               'pretty_name':  pretty_name
++                               }
++                    self.status(message)
++                    continue
+                 # Skip too small devices, but inform the user
+                 if not info['is_device_big_enough']:
+                     message =_('The device "%(pretty_name)s"'
diff --git a/debian/patches/series b/debian/patches/series
index 10d87a0..0c77508 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 tails-installer-as-helper
+10731.patch

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