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

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

Browse Source
This commit is contained in:
David Black 2013-05-17 21:44:28 +01:00
commit dfa95316a0
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fdroidserver/checkupdates.py
View File

@ -96,21 +96,32 @@ def check_tags(app, sdk_path):
# caution, because it's inappropriate for many projects.
# Returns (None, "a message") if this didn't work, or (version, vercode) for
# the details of the current version.
def check_repomanifest(app, sdk_path, branch="master"):
def check_repomanifest(app, sdk_path, branch=None):
try:
build_dir = 'build/' + app['id']
if app['Repo Type'] not in ('git', 'git-svn'):
return (None, 'RepoManifest update mode only works for git and git-svn repositories currently')
if app['Repo Type'] == 'bzr':
return (None, 'RepoManifest update mode has not been ported to bzr repositories yet')
# Set up vcs interface and make sure we have the latest code...
vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir, sdk_path)
if app['Repo Type'] == 'git':
vcs.gotorevision('origin/'+branch)
if branch:
vcs.gotorevision('origin/'+branch)
else:
vcs.gotorevision('origin/master')
pass
elif app['Repo Type'] == 'git-svn':
vcs.gotorevision('trunk')
elif app['Repo Type'] == 'svn':
pass
elif app['Repo Type'] == 'hg':
if branch:
vcs.gotorevision(branch)
else:
vcs.gotorevision('default')
if len(app['builds']) == 0:
return (None, "Can't use RepoManifest with no builds defined")

13
fdroidserver/stats.py
View File

@ -159,6 +159,19 @@ def main():
f.write(rtype + ' ' + str(count) + '\n')
f.close()
# Calculate and write stats for update check modes...
ucms = {}
for app in metaapps:
checkmode = app['Update Check Mode']
if checkmode in ucms:
ucms[checkmode] += 1;
else:
ucms[checkmode] = 1
f = open('stats/update_check_modes.txt', 'w')
for checkmode, count in ucms.iteritems():
f.write(checkmode + ' ' + str(count) + '\n')
f.close()
# Calculate and write stats for licenses...
licenses = {}
for app in metaapps: