Skip to content

Commit

Permalink
Fix error in parsing iso list
Browse files Browse the repository at this point in the history
  • Loading branch information
Hagb committed Apr 26, 2021
1 parent 05c5996 commit f7bebe7
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions geninfo/genisolist.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@
def getPlatformPriority(platform):
platform = platform.lower()
if platform in ['amd64', 'x86_64', '64bit']:
return 100
return b'\x00'
elif platform in ['i386', 'i486', 'i586', 'i686', 'x86', '32bit']:
return 90
return b'\x01'
else:
return 0
return platform.encode()


def renderTemplate(template, result):
Expand Down Expand Up @@ -83,7 +83,9 @@ def parseSection(items):
imageinfo['version'] = '0.0'
sort_by = items.get("sort_by", "")
if not(sort_by):
imageinfo['sort_key'] = (imageinfo['version'], imageinfo['platform'], imageinfo['type'])
imageinfo['sort_key'] = (imageinfo['version'],
getPlatformPriority(imageinfo['platform']),
getPlatformPriority(imageinfo['type']))
else:
imageinfo['sort_key'] = getSortKeys(sort_by, result)

Expand All @@ -94,12 +96,6 @@ def parseSection(items):
images[key].append(imageinfo)

for image_group in images.values():
if 'nosort' not in items:
image_group.sort(key=lambda k: (LooseVersion(k['version']),
getPlatformPriority(k['platform']),
k['type']),
reverse=True)

i = 0
versions = set()
listvers = int(items.get('listvers', 0xFF))
Expand Down

0 comments on commit f7bebe7

Please sign in to comment.