[Pkg-privacy-commits] [tails-installer] 179/210: Fix detection of removable drives in console mode

[Intrigeri]

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

intrigeri pushed a commit to tag 3.90.0
in repository tails-installer.

commit 328efd0d4ed31c2b17eb44a3471b412749b2776e
Author: Martin Briza <mbriza at redhat.com>
Date:   Mon Oct 19 17:04:05 2015 +0200

    Fix detection of removable drives in console mode
---
 liveusb/creator.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 942ef50..59a6896 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -678,6 +678,12 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
 
             self.drives[name] = data
 
+            if not self.drive and self.opts.console and not self.opts.force:
+                self.drive = name
+
+            if self.opts.force == data['device']:
+                self.drive = name
+
             if self.callback:
                 self.callback()
 
@@ -688,8 +694,9 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
             if self.callback:
                 self.callback()
 
-        self.bus.add_signal_receiver(handleAdded, "InterfacesAdded", "org.freedesktop.DBus.ObjectManager", "org.freedesktop.UDisks2", "/org/freedesktop/UDisks2")
-        self.bus.add_signal_receiver(handleRemoved, "InterfacesRemoved", "org.freedesktop.DBus.ObjectManager", "org.freedesktop.UDisks2", "/org/freedesktop/UDisks2")
+        if not self.opts.console:
+            self.bus.add_signal_receiver(handleAdded, "InterfacesAdded", "org.freedesktop.DBus.ObjectManager", "org.freedesktop.UDisks2", "/org/freedesktop/UDisks2")
+            self.bus.add_signal_receiver(handleRemoved, "InterfacesRemoved", "org.freedesktop.DBus.ObjectManager", "org.freedesktop.UDisks2", "/org/freedesktop/UDisks2")
 
         for name, device in self.udisks.GetManagedObjects().iteritems():
             handleAdded(name, device)

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