[Pkg-privacy-commits] [tails-installer] 121/210: Moved "drive verification", aka setting a label to where it belongs

[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 2111e4d6afeeb90aea1059a694b7ad44f27da7d1
Author: Martin Briza <mbriza at redhat.com>
Date:   Tue Jul 28 15:33:40 2015 +0200

    Moved "drive verification", aka setting a label to where it belongs
---
 liveusb/gui.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/liveusb/gui.py b/liveusb/gui.py
index e6eb592..4648674 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -238,6 +238,12 @@ class ReleaseWriterThread(QThread):
         #self.live.log.addHandler(handler)
         now = datetime.now()
         try:
+            self.live.verify_filesystem()
+            if not self.live.drive['uuid'] and not self.live.label:
+                self.parent.parent.error = _('Error: Cannot set the label or obtain '
+                              'the UUID of your device.  Unable to continue.')
+                self.parent.running = False
+                return
             if self.parent.release.liveUSBData.option('dd'):
                 self.ddImage(now)
             else:
@@ -505,13 +511,6 @@ class Release(QObject):
         if self.live.existing_liveos() and not self.parent().option('dd'):
             self.addWarning(_('Your device already contains a live OS. If you continue, it will be overwritten.'))
 
-        self.live.verify_filesystem()
-        if not self.live.drive['uuid'] and not self.live.label:
-            self.parent.status = _('Error: Cannot set the label or obtain '
-                          'the UUID of your device.  Unable to continue.')
-            #self.live.log.removeHandler(handler)
-            return
-
     @pyqtProperty(int, constant=True)
     def index(self):
         return self._index

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