kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-13 02:30:11 +01:00
Code Activity

Small fixes to checkupdates

Browse Source
This commit is contained in:
Daniel Martí 2013-08-13 14:51:40 +02:00
parent 578e030ee6
commit cf47e151f7
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fdroidserver/checkupdates.py
View File

@ -139,6 +139,8 @@ def check_repomanifest(app, sdk_path, branch=None):
elif vcs.repotype() == 'bzr':
vcs.gotorevision(None)
flavour = None
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
@ -150,7 +152,7 @@ def check_repomanifest(app, sdk_path, branch=None):
paths = common.manifest_paths(build_dir, flavour)
version, vercode, package = common.parse_androidmanifest(paths)
version, vercode, package = common.parse_androidmanifests(paths)
if not package:
return (None, "Couldn't find package ID")
if package != app['id']:

2
fdroidserver/common.py
View File

@ -930,7 +930,7 @@ def parse_androidmanifests(paths):
for path in paths:
gradle = path.endswith("build.gradle")
gradle = path.endswith("gradle")
version = None
vercode = None
package = None