[Pkg-privacy-commits] [tails-installer] 192/210: Use the absolute path of 7z in Windows

[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 43abc804ce85c528044deb37b2211abe331a29c7
Author: Martin Briza <mbriza at redhat.com>
Date:   Mon Nov 2 17:52:06 2015 +0100

    Use the absolute path of 7z in Windows
---
 liveusb/creator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 59a6896..61eede2 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1304,8 +1304,8 @@ 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' % (
-                   self.iso, self.drive['device']))
+        self.popen('"%s/7z.exe" x "%s" -x![BOOT] -y -o%s' % (
+                   os.path.dirname(sys.argv[0]), self.iso, self.drive['device']))
         delta = datetime.now() - start
         if delta.seconds:
             self.mb_per_sec = (self.isosize / delta.seconds) / 1024**2

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