mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-06 15:30:28 +03:00
Try and adapt checkupdates to gradle better
This commit is contained in:
parent
1e7bfc9864
commit
578e030ee6
2 changed files with 65 additions and 50 deletions
|
|
@ -74,14 +74,13 @@ def check_tags(app, sdk_path):
|
|||
vcs.gotorevision(tag)
|
||||
|
||||
# Only process tags where the manifest exists...
|
||||
path = common.manifest_path(build_dir, flavour)
|
||||
if path is not None:
|
||||
version, vercode, package = common.parse_androidmanifest(path)
|
||||
print "Manifest exists. Found version %s" % version
|
||||
if package and package == app['id'] and version and vercode:
|
||||
if int(vercode) > int(hcode):
|
||||
hcode = str(int(vercode))
|
||||
hver = version
|
||||
paths = common.manifest_paths(build_dir, flavour)
|
||||
version, vercode, package = common.parse_androidmanifests(paths)
|
||||
print "Manifest exists. Found version %s" % version
|
||||
if package and package == app['id'] and version and vercode:
|
||||
if int(vercode) > int(hcode):
|
||||
hcode = str(int(vercode))
|
||||
hver = version
|
||||
|
||||
if hver:
|
||||
return (hver, hcode)
|
||||
|
|
@ -149,11 +148,9 @@ 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")
|
||||
|
||||
path = common.manifest_path(build_dir, flavour)
|
||||
if path is None:
|
||||
return (None, "No manifest could be found")
|
||||
paths = common.manifest_paths(build_dir, flavour)
|
||||
|
||||
version, vercode, package = common.parse_androidmanifest(path)
|
||||
version, vercode, package = common.parse_androidmanifest(paths)
|
||||
if not package:
|
||||
return (None, "Couldn't find package ID")
|
||||
if package != app['id']:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue