1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00

Small fixes, no change in behaviour

This commit is contained in:
Daniel Martí 2013-11-19 16:11:58 +01:00
parent f35d965d2a
commit 7d20141957

View File

@ -79,7 +79,7 @@ valuetypes = {
[ 'vercode' ]), [ 'vercode' ]),
'http' : FieldType("HTTP link", 'http' : FieldType("HTTP link",
r'^http[s]?://.+$', None, r'^http[s]?://', None,
[ "Web Site", "Source Code", "Issue Tracker", "Donate" ], []), [ "Web Site", "Source Code", "Issue Tracker", "Donate" ], []),
'bitcoin' : FieldType("Bitcoin address", 'bitcoin' : FieldType("Bitcoin address",
@ -672,17 +672,18 @@ def write_metadata(dest, app):
'preassemble', 'bindir', 'antcommand', 'novcheck'] 'preassemble', 'bindir', 'antcommand', 'novcheck']
def write_builditem(key, value): def write_builditem(key, value):
if key not in ['version', 'vercode', 'origlines']: if key in ['version', 'vercode', 'origlines']:
if key in valuetypes['bool'].attrs: return
if not value: if key in valuetypes['bool'].attrs:
return if not value:
value = 'yes' return
#if options.verbose: value = 'yes'
#print "...writing {0} : {1}".format(key, value) #if options.verbose:
outline = ' %s=' % key #print "...writing {0} : {1}".format(key, value)
outline += '&& \\\n '.join([s.lstrip() for s in value.split('&& ')]) outline = ' %s=' % key
outline += '\n' outline += '&& \\\n '.join([s.lstrip() for s in value.split('&& ')])
mf.write(outline) outline += '\n'
mf.write(outline)
for key in keyorder: for key in keyorder:
if key in build: if key in build: