mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-04 02:00:11 +02:00
throw error on ancient, obsolete BuildVersion/UseBuilt metadata fields
This commit is contained in:
parent
019ec6d4ba
commit
2113e29082
@ -228,16 +228,15 @@ TYPE_LIST = 4
|
|||||||
TYPE_SCRIPT = 5
|
TYPE_SCRIPT = 5
|
||||||
TYPE_MULTILINE = 6
|
TYPE_MULTILINE = 6
|
||||||
TYPE_BUILD = 7
|
TYPE_BUILD = 7
|
||||||
TYPE_BUILD_V2 = 8
|
TYPE_INT = 8
|
||||||
TYPE_INT = 9
|
|
||||||
|
|
||||||
fieldtypes = {
|
fieldtypes = {
|
||||||
'Description': TYPE_MULTILINE,
|
'Description': TYPE_MULTILINE,
|
||||||
'MaintainerNotes': TYPE_MULTILINE,
|
'MaintainerNotes': TYPE_MULTILINE,
|
||||||
'Categories': TYPE_LIST,
|
'Categories': TYPE_LIST,
|
||||||
'AntiFeatures': TYPE_LIST,
|
'AntiFeatures': TYPE_LIST,
|
||||||
'BuildVersion': TYPE_BUILD,
|
'Build': TYPE_BUILD,
|
||||||
'Build': TYPE_BUILD_V2,
|
'BuildVersion': TYPE_OBSOLETE,
|
||||||
'UseBuilt': TYPE_OBSOLETE,
|
'UseBuilt': TYPE_OBSOLETE,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1333,7 +1332,7 @@ def parse_txt_metadata(mf, app):
|
|||||||
f = f.replace(' ', '')
|
f = f.replace(' ', '')
|
||||||
|
|
||||||
ftype = fieldtype(f)
|
ftype = fieldtype(f)
|
||||||
if ftype not in [TYPE_BUILD, TYPE_BUILD_V2]:
|
if ftype not in [TYPE_BUILD]:
|
||||||
add_comments(f)
|
add_comments(f)
|
||||||
if ftype == TYPE_MULTILINE:
|
if ftype == TYPE_MULTILINE:
|
||||||
mode = 1
|
mode = 1
|
||||||
@ -1345,15 +1344,6 @@ def parse_txt_metadata(mf, app):
|
|||||||
elif ftype == TYPE_LIST:
|
elif ftype == TYPE_LIST:
|
||||||
app[f] = split_list_values(v)
|
app[f] = split_list_values(v)
|
||||||
elif ftype == TYPE_BUILD:
|
elif ftype == TYPE_BUILD:
|
||||||
if v.endswith("\\"):
|
|
||||||
mode = 2
|
|
||||||
del buildlines[:]
|
|
||||||
buildlines.append(v[:-1])
|
|
||||||
else:
|
|
||||||
build = parse_buildline([v])
|
|
||||||
app.builds.append(build)
|
|
||||||
add_comments('build:' + app.builds[-1].versionCode)
|
|
||||||
elif ftype == TYPE_BUILD_V2:
|
|
||||||
vv = v.split(',')
|
vv = v.split(',')
|
||||||
if len(vv) != 2:
|
if len(vv) != 2:
|
||||||
warn_or_exception(_('Build should have comma-separated '
|
warn_or_exception(_('Build should have comma-separated '
|
||||||
@ -1372,7 +1362,9 @@ def parse_txt_metadata(mf, app):
|
|||||||
del buildlines[:]
|
del buildlines[:]
|
||||||
mode = 3
|
mode = 3
|
||||||
elif ftype == TYPE_OBSOLETE:
|
elif ftype == TYPE_OBSOLETE:
|
||||||
pass # Just throw it away!
|
warn_or_exception(_("'{field}' in {linedesc} is obsolete, see docs for current fields:")
|
||||||
|
.format(field=f, linedesc=linedesc)
|
||||||
|
+ '\nhttps://f-droid.org/docs/')
|
||||||
else:
|
else:
|
||||||
warn_or_exception(_("Unrecognised field '{field}' in {linedesc}")
|
warn_or_exception(_("Unrecognised field '{field}' in {linedesc}")
|
||||||
.format(field=f, linedesc=linedesc))
|
.format(field=f, linedesc=linedesc))
|
||||||
|
Loading…
Reference in New Issue
Block a user