15308555518/ mirror-web
1
0
Fork 0
mirror of https://github.com/tuna/mirror-web.git synced 2025-12-25 20:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'wizard' of github.com:tuna/mirror-web into wizard

This commit is contained in:
Xavier Yao 2016-11-13 19:02:41 +08:00
parent 999f12c4c5 f082f5e8a3
commit f235d7b1f5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geninfo/genisolist.ini
View File

@ -181,7 +181,7 @@ platform = $2
distro = Qt 5
listvers = 1
location = qt/official_releases/qt/5.*/5.*/qt-opensource-*
pattern = qt-opensource-(.*)-([\d.]+).(run|dmg|exe)
pattern = qt-opensource-(.*?)-([\d.]+).(run|dmg|exe)
platform = $1
version = $2
category = app
@ -200,7 +200,7 @@ category = app
distro = VirtualBox
listvers = 1
location = virtualbox/virtualbox-*
pattern = virtualbox-(.*)-(latest).(exe|dmg)
pattern = virtualbox-(.*?)-(latest).(exe|dmg)
platform = $1
version = $2
category = app
@ -237,7 +237,7 @@ category = app
distro = Anaconda
listvers = 1
location = anaconda/archive/Anaconda*
pattern = (Anaconda\d*)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86|x86_64).\w+
pattern = (Anaconda\d*)-(\d+.\d+.\d+)-(Windows|Linux|MacOSX)-(x86_64|x86).\w+
platform = $3
type = $4
version = $2

2
geninfo/genisolist.py
View File

@ -60,7 +60,7 @@ def parseSection(items):
for prop in ("version", "type", "platform", "category"):
s = items.get(prop, "")
for i in range(0, group_count):
s = s.replace("$%d" % i, result.group(i))
s = s.replace("$%d" % i, result.group(i) or "")
imageinfo[prop] = s
logger.debug("[JSON] %r", imageinfo)