From: Daniel Martí Date: Sun, 26 May 2013 18:17:47 +0000 (+0200) Subject: Tags and RM with no builds default to no subdir X-Git-Tag: 0.1~558^2~7 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2d8ccbb6586734f978f9ec5bb64c968d1702c0eb;p=fdroidserver.git Tags and RM with no builds default to no subdir --- diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py index de36acab..4bf2752e 100644 --- a/fdroidserver/checkupdates.py +++ b/fdroidserver/checkupdates.py @@ -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" @@ -135,11 +133,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: