[Pkg-privacy-commits] [tails-installer] 28/30: Improve setting of current drive

[Intrigeri]

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

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

commit 59808813d16b5fcb4555415cccf512f95cdb2544
Author: Martin Bříza <m at rtinbriza.cz>
Date:   Thu Apr 7 17:50:44 2016 +0200

    Improve setting of current drive
---
 liveusb/creator.py | 3 +++
 liveusb/gui.py     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index e22103e..f27c460 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -220,6 +220,9 @@ class LiveUSBCreator(object):
                     drive = key
                     found = True
                     break
+                elif self.drives[key] == drive:
+                    drive = key
+                    found = True
             if not found:
                 raise LiveUSBError(_("Cannot find device %s" % drive))
         self.log.debug("%s selected: %s" % (drive, self.drives[drive]))
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 46f9eb8..502e531 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -735,7 +735,7 @@ class LiveUSBData(QObject):
                 if drive.drive.isIso9660:
                     self._driveToRestore = drive
                 if self.currentDrive == -1 and not self.live.drive:
-                    self.live.drive = drive
+                    self.live.drive = drive.drive
 
             self.currentDriveChanged.emit()
             self.driveToRestoreChanged.emit()

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