[Pkg-privacy-commits] [tails-installer] 204/210: Fix Windows 7z resolving issues

[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 3ac60cef313ecb7c3b48af35e974adccce33b5bd
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Nov 5 17:05:39 2015 +0100

    Fix Windows 7z resolving issues
---
 liveusb/creator.py | 3 +--
 liveusb/gui.py     | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 429f3f4..835896e 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1304,8 +1304,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
         """ Extract our ISO with 7-zip directly to the USB key """
         self.log.info(_("Extracting live image to USB device..."))
         start = datetime.now()
-        self.popen('7z x "%s" -x![BOOT] -y -o%s' % (
-                   os.path.dirname(sys.argv[0]), self.iso, self.drive['device']))
+        self.popen('7z x "%s" -x![BOOT] -y -o%s' % (self.iso, self.drive['device']))
         delta = datetime.now() - start
         if delta.seconds:
             self.mb_per_sec = (self.isosize / delta.seconds) / 1024**2
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 7c0c427..bc397b5 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -239,8 +239,8 @@ class ReleaseWriterThread(QThread):
         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.release.addError(_('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'):

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