[Pkg-privacy-commits] [tails-installer] 04/06: Update the release scraper for the new checksum format in F22

[anonym]

This is an automated email from the git hooks/post-receive script.

anonym-tails-guest pushed a commit to annotated tag 3.14.2
in repository tails-installer.

commit 54ccd789d402bcadd1c543ceb5225ddb97c922b4
Author: Luke Macken <lmacken at redhat.com>
Date:   Tue May 26 14:38:08 2015 -0600

    Update the release scraper for the new checksum format in F22
    
    https://fedorahosted.org/rel-eng/ticket/6100
---
 liveusb/releases.py | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/liveusb/releases.py b/liveusb/releases.py
index a49d776..4fd9f1b 100644
--- a/liveusb/releases.py
+++ b/liveusb/releases.py
@@ -44,19 +44,34 @@ def get_fedora_releases():
                             print('Reading %s' % arch_url + link)
                             checksum = urlread(arch_url + link)
                             for line in checksum.split('\n'):
-                                try:
-                                    sha256, filename = line.split()
-                                    if filename[0] != '*':
-                                        continue
-                                    filename = filename[1:]
-                                    name = filename.replace('.iso', '')
-                                    fedora_releases.append(dict(
-                                        name=name,
-                                        url=arch_url + filename,
-                                        sha256=sha256,
-                                    ))
-                                except ValueError:
-                                    pass
+                                if release >= 22:
+                                    # SHA256 (filename) = checksum
+                                    if '=' in line:
+                                        try:
+                                            hash_type, filename, _, sha256 = line.split()
+                                            filename = filename[1:-1]
+                                            name = filename.replace('.iso', '')
+                                            fedora_releases.append(dict(
+                                                name=name,
+                                                url=arch_url + filename,
+                                                sha256=sha256,
+                                            ))
+                                        except ValueError:
+                                            pass
+                                else:
+                                    try:
+                                        sha256, filename = line.split()
+                                        if filename[0] != '*':
+                                            continue
+                                        filename = filename[1:]
+                                        name = filename.replace('.iso', '')
+                                        fedora_releases.append(dict(
+                                            name=name,
+                                            url=arch_url + filename,
+                                            sha256=sha256,
+                                        ))
+                                    except ValueError:
+                                        pass
         releases = fedora_releases
     except:
         traceback.print_exc()

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