[Pkg-privacy-commits] [tails-installer] 01/30: Fixes Bug #10731: Tails Installer lists non-removable devices it won't be able to use.

[anonym]

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

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

commit 185e11ae20533882562617d945cfd2e8122e8eb7
Author: Tails developers <amnesia at boum.org>
Date:   Fri May 20 17:04:03 2016 +0200

    Fixes Bug #10731: Tails Installer lists non-removable devices it won't be able to use.
---
 tails_installer/creator.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tails_installer/creator.py b/tails_installer/creator.py
index 4683c3c..682cb59 100755
--- a/tails_installer/creator.py
+++ b/tails_installer/creator.py
@@ -579,7 +579,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 = {}
@@ -613,7 +612,14 @@ class LinuxTailsInstallerCreator(TailsInstallerCreator):
                 'size': drive.props.size,
                 'mounted_partitions': set(),
                 'is_device_big_enough': True,
+                'removable': drive.props.media_removable,
             }
+
+            # Skip non-removable drives
+            if not data['removable']:
+                self.log.debug('Skipping non-removable device: %s' % data['device'])
+                continue
+
             # 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']:

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