mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-07 07:50:28 +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:
Ciaran Gultnieks 2013-05-31 07:59:50 +01:00
commit 94afbd8878
5 changed files with 40 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

24
fdroidserver/checkupdates.py
View file

@ -60,11 +60,9 @@ def check_tags(app, sdk_path):
vcs.gotorevision(None)
if len(app['builds']) == 0:
return (None, "Can't use Tags with no builds defined")
if 'subdir' in app['builds'][-1]:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
hver = None
hcode = "0"
@ -126,7 +124,10 @@ def check_repomanifest(app, sdk_path, branch=None):
vcs.gotorevision('origin/master')
pass
elif vcs.repotype() == 'git-svn':
vcs.gotorevision(None)
if branch:
vcs.gotorevision(branch)
else:
vcs.gotorevision(None)
elif vcs.repotype() == 'svn':
vcs.gotorevision(None)
elif vcs.repotype() == 'hg':
@ -135,11 +136,9 @@ def check_repomanifest(app, sdk_path, branch=None):
else:
vcs.gotorevision('default')
if len(app['builds']) == 0:
return (None, "Can't use RepoManifest with no builds defined")
if 'subdir' in app['builds'][-1]:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
if len(app['builds']) > 0:
if 'subdir' in app['builds'][-1]:
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
version, vercode, package = common.parse_androidmanifest(build_dir)
if not package:
@ -177,9 +176,6 @@ def check_market(app):
except urllib2.HTTPError, e:
if e.code == 404:
return (None, 'Not in market')
elif e.code == 503:
print "Whoops"
sys.exit(1)
else:
return (None, 'Failed with HTTP status' + str(req.getcode()))
except Exception, e: