[Pkg-privacy-commits] [tails-installer] 158/210: Use the friendly drive names again

[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 bdccde6882422f7c52111c4957c7097682a49359
Author: Martin Briza <mbriza at redhat.com>
Date:   Mon Sep 7 14:22:13 2015 +0200

    Use the friendly drive names again
---
 liveusb/creator.py | 1 +
 liveusb/gui.py     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index a6309e2..c3e16aa 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -637,6 +637,7 @@ class LinuxLiveUSBCreator(LiveUSBCreator):
                 'device': self.strify(blk['Device']),
                 'mount': map(self.strify, fs['MountPoints']),
                 'size': int(blk['Size']),
+                'friendlyName': str(drive['Vendor']) + ' ' + str(drive['Model'])
             }
             self.log.debug('data = %r' % data)
 
diff --git a/liveusb/gui.py b/liveusb/gui.py
index d7bac97..bc619e2 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -809,8 +809,8 @@ class LiveUSBData(QObject):
             previouslySelected = self._usbDrives[self._currentDrive].drive['device']
         for drive, info in self.live.drives.items():
             name = ''
-            if 'vendor' in info and 'model' in info:
-                name = info['vendor'] + ' ' + info['model']
+            if 'friendlyName' in info:
+                name = info['friendlyName']
             elif 'label' in info:
                 name = info['device'] + ' - ' + info['label']
             else:

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