mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-13 18:50:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of gitorious.org:f-droid/fdroidserver

Browse source
This commit is contained in:
Daniel Martí 2013-08-14 11:46:15 +02:00
commit b1c90ace71
3 changed files with 49 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/checkupdates.py
View file

@ -145,7 +145,13 @@ def check_repomanifest(app, sdk_path, branch=None):
if not os.path.isdir(build_dir):
return (None, "Subdir '" + app['builds'][-1]['subdir'] + "'is not a valid directory")
version, vercode, package = common.parse_androidmanifest(build_dir)
if os.path.exists(os.path.join(build_dir, 'AndroidManifest.xml')):
version, vercode, package = common.parse_androidmanifest(build_dir)
elif os.path.exists(os.path.join(build_dir, 'src', 'main', 'AndroidManifest.xml')):
# Alternate location for simple gradle locations...
version, vercode, package = common.parse_androidmanifest(os.path.join(build_dir, 'src', 'main'))
else:
return (None, "AndroidManifest.xml not found")
if not package:
return (None, "Couldn't find package ID")
if package != app['id']: