[Pkg-privacy-commits] [tails-installer] 201/210: Better resolution of tool binaries

[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 72706f611181b393d443da8e0233db5743fdc356
Author: Martin Briza <mbriza at redhat.com>
Date:   Thu Nov 5 16:00:17 2015 +0100

    Better resolution of tool binaries
---
 liveusb-creator.pyi.spec | 2 +-
 liveusb/creator.py       | 4 ++--
 liveusb/gui.py           | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/liveusb-creator.pyi.spec b/liveusb-creator.pyi.spec
index 5f777c0..4e44643 100644
--- a/liveusb-creator.pyi.spec
+++ b/liveusb-creator.pyi.spec
@@ -36,7 +36,7 @@ newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\QtQml", prefix = 'QtQml')
 newqml += Tree("C:\\Qt\\5.5\\mingw492_32\\qml\\Qt", prefix = 'Qt')
 
 tools = []
-tools += Tree("tools")
+tools += Tree("tools", prefix = 'tools')
 
 stripQml(a.binaries)
 stripDebug(a.binaries)
diff --git a/liveusb/creator.py b/liveusb/creator.py
index 61eede2..429f3f4 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -1304,7 +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('"%s/7z.exe" x "%s" -x![BOOT] -y -o%s' % (
+        self.popen('7z 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:
@@ -1401,7 +1401,7 @@ class WindowsLiveUSBCreator(LiveUSBCreator):
         prgmfiles = os.getenv('PROGRAMFILES')
         folder = 'LiveUSB Creator'
         paths = [os.path.join(x, folder) for x in (prgmfiles, prgmfiles + ' (x86)')]
-        paths += [os.path.join(os.path.dirname(__file__), '..', '..'), '.']
+        paths += [os.path.join(os.path.dirname(__file__), '..', '..'), '.', os.path.dirname(sys.argv[0])]
         tool = None
         for path in paths:
             exe = os.path.join(path, 'tools', '%s.exe' % cmd[0])
diff --git a/liveusb/gui.py b/liveusb/gui.py
index 00248f3..393f2c1 100755
--- a/liveusb/gui.py
+++ b/liveusb/gui.py
@@ -81,7 +81,6 @@ class ReleaseDownloadThread(QThread):
 
     def run(self):
         self.grabber = URLGrabber(progress_obj=self.progress, proxies=self.proxies)
-        print(self.progress.release.url)
         home = os.getenv('HOME', 'USERPROFILE')
         filename = os.path.basename(urlparse.urlparse(self.progress.release.url).path)
         try:

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