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

Retrieve app and version name from the same tag in UCM:Tags

Browse Source
This commit is contained in:
Daniel Martí 2013-10-29 09:55:15 +01:00
parent 4fb857bbb0
commit 1a4b18e2e8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fdroidserver/checkupdates.py
View File

@ -106,6 +106,7 @@ def check_tags(app, sdk_path):
if 'gradle' in app['builds'][-1]: if 'gradle' in app['builds'][-1]:
flavour = app['builds'][-1]['gradle'] flavour = app['builds'][-1]['gradle']
htag = None
hver = None hver = None
hcode = "0" hcode = "0"
@ -118,22 +119,23 @@ def check_tags(app, sdk_path):
if package and package == app['id'] and version and vercode: if package and package == app['id'] and version and vercode:
print "Manifest exists. Found version %s" % version print "Manifest exists. Found version %s" % version
if int(vercode) > int(hcode): if int(vercode) > int(hcode):
htag = tag
hcode = str(int(vercode)) hcode = str(int(vercode))
hver = version hver = version
if hver: if hver:
return (hver, hcode) return (hver, hcode, htag)
return (None, "Couldn't find any version information") return (None, "Couldn't find any version information", None)
except BuildException as be: except BuildException as be:
msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be) msg = "Could not scan app %s due to BuildException: %s" % (app['id'], be)
return (None, msg) return (None, msg, None)
except VCSException as vcse: except VCSException as vcse:
msg = "VCS error while scanning app %s: %s" % (app['id'], vcse) msg = "VCS error while scanning app %s: %s" % (app['id'], vcse)
return (None, msg) return (None, msg, None)
except Exception: except Exception:
msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc()) msg = "Could not scan app %s due to unknown error: %s" % (app['id'], traceback.format_exc())
return (None, msg) return (None, msg, None)
# Check for a new version by looking at the AndroidManifest.xml at the HEAD # Check for a new version by looking at the AndroidManifest.xml at the HEAD
# of the source repo. Whether this can be used reliably or not depends on # of the source repo. Whether this can be used reliably or not depends on
@ -329,9 +331,10 @@ def main():
writeit = False writeit = False
logmsg = None logmsg = None
tag = None
mode = app['Update Check Mode'] mode = app['Update Check Mode']
if mode == 'Tags': if mode == 'Tags':
(version, vercode) = check_tags(app, sdk_path) (version, vercode, tag) = check_tags(app, sdk_path)
elif mode == 'RepoManifest': elif mode == 'RepoManifest':
(version, vercode) = check_repomanifest(app, sdk_path) (version, vercode) = check_repomanifest(app, sdk_path)
elif mode.startswith('RepoManifest/'): elif mode.startswith('RepoManifest/'):
@ -372,7 +375,7 @@ def main():
app_dir = os.path.join('build/', app['id']) app_dir = os.path.join('build/', app['id'])
vcs = common.getvcs(app["Repo Type"], app["Repo"], app_dir, sdk_path) vcs = common.getvcs(app["Repo Type"], app["Repo"], app_dir, sdk_path)
vcs.gotorevision(None) vcs.gotorevision(tag)
flavour = None flavour = None
if len(app['builds']) > 0: if len(app['builds']) > 0: