kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-09-17 10:40:12 +02:00
Code Activity

Don't need legacy disabled build handling everywhere now

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-10-27 14:40:02 +00:00
parent 075551b715
commit ccdea798fc
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/build.py
View File

@ -681,7 +681,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, also_check_dir, srclib_dir,
if os.path.exists(dest_also): if os.path.exists(dest_also):
return False return False
if thisbuild['commit'].startswith('!') or 'disable' in thisbuild: if 'disable' in thisbuild:
return False return False
print "Building version " + thisbuild['version'] + ' of ' + app['id'] print "Building version " + thisbuild['version'] + ' of ' + app['id']

4
fdroidserver/common.py
View File

@ -475,7 +475,7 @@ def parse_metadata(metafile, verbose=False):
if parts[2].startswith('!'): if parts[2].startswith('!'):
# For backwards compatibility, handle old-style disabling, # For backwards compatibility, handle old-style disabling,
# including attempting to extract the commit from the message # including attempting to extract the commit from the message
thisbuild['disabled'] = parts[2] thisbuild['disable'] = parts[2]
commit = 'unknown - see disabled' commit = 'unknown - see disabled'
index = parts[2].rfind('at ') index = parts[2].rfind('at ')
if index != -1: if index != -1:
@ -757,7 +757,7 @@ def write_metadata(dest, app, verbose=False):
# This defines the preferred order for the build items - as in the # This defines the preferred order for the build items - as in the
# manual, they're roughly in order of application. # manual, they're roughly in order of application.
keyorder = ['disabled', 'commit', 'subdir', 'submodules', 'init', keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
'oldsdkloc', 'target', 'compilesdk', 'update', 'oldsdkloc', 'target', 'compilesdk', 'update',
'encoding', 'forceversion', 'forcevercode', 'rm', 'encoding', 'forceversion', 'forcevercode', 'rm',
'fixtrans', 'fixapos', 'extlibs', 'srclibs', 'fixtrans', 'fixapos', 'extlibs', 'srclibs',

2
fdroidserver/scanner.py
View File

@ -86,7 +86,7 @@ def main():
for thisbuild in app['builds']: for thisbuild in app['builds']:
if thisbuild['commit'].startswith('!') or 'disable' in thisbuild: if 'disable' in thisbuild:
print ("..skipping version " + thisbuild['version'] + " - " + print ("..skipping version " + thisbuild['version'] + " - " +
thisbuild.get('disable', thisbuild['commit'][1:])) thisbuild.get('disable', thisbuild['commit'][1:]))
else: else:

2
fdroidserver/update.py
View File

@ -232,7 +232,7 @@ def delete_disabled_builds(apps, apkcache, repodirs):
""" """
for app in apps: for app in apps:
for build in app['builds']: for build in app['builds']:
if build['commit'].startswith('!') or 'disable' in build: if 'disable' in build:
apkfilename = app['id'] + '_' + str(build['vercode']) + '.apk' apkfilename = app['id'] + '_' + str(build['vercode']) + '.apk'
for repodir in repodirs: for repodir in repodirs:
apkpath = os.path.join(repodir, apkfilename) apkpath = os.path.join(repodir, apkfilename)