[Pkg-privacy-commits] [tails-installer] 148/210: Fix an error message

Intrigeri intrigeri at moszumanska.debian.org
Wed May 24 15:26:39 UTC 2017


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 6b20280d6cb5dbd48975c960e3d85586e78c8179
Author: Martin Briza <mbriza at redhat.com>
Date:   Fri Aug 28 13:14:41 2015 +0200

    Fix an error message
---
 liveusb/creator.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/liveusb/creator.py b/liveusb/creator.py
index 3539308..2c703c1 100755
--- a/liveusb/creator.py
+++ b/liveusb/creator.py
@@ -258,7 +258,7 @@ class LiveUSBCreator(object):
         self.log.debug('overlaysize = %d' % overlaysize)
         self.totalsize = overlaysize + self.isosize
         if self.totalsize > freebytes:
-            raise LiveUSBError(_("There is not enough free space on the selected device. Required: %s. Free: %s." %
+            raise LiveUSBError(_("There is not enough free space on the selected device.\nRequired: %s. Free: %s." %
                                  (str(self.isosize/1024**2 + self.overlay) + "MB",
                                   str(freebytes/1024**2) + "MB")))
 
@@ -390,8 +390,9 @@ class LiveUSBCreator(object):
         """ If the ISO is for a known release, return it. """
         isoname = os.path.basename(self.iso)
         for release in releases:
-            if os.path.basename(release['url']) == isoname:
-                return release
+            for arch in release['variants'].keys():
+                if os.path.basename(release['variants'][arch]['url']) == isoname:
+                    return release
 
     def _set_drive(self, drive):
         if drive == None:

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



More information about the Pkg-privacy-commits mailing list