mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-16 16:02:33 +03:00
Tags and RM with no builds default to no subdir
This commit is contained in:
parent
d2bce9e732
commit
2d8ccbb658
1 changed files with 6 additions and 10 deletions
|
@ -60,11 +60,9 @@ def check_tags(app, sdk_path):
|
||||||
|
|
||||||
vcs.gotorevision(None)
|
vcs.gotorevision(None)
|
||||||
|
|
||||||
if len(app['builds']) == 0:
|
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 'subdir' in app['builds'][-1]:
|
|
||||||
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
|
|
||||||
|
|
||||||
hver = None
|
hver = None
|
||||||
hcode = "0"
|
hcode = "0"
|
||||||
|
@ -135,11 +133,9 @@ def check_repomanifest(app, sdk_path, branch=None):
|
||||||
else:
|
else:
|
||||||
vcs.gotorevision('default')
|
vcs.gotorevision('default')
|
||||||
|
|
||||||
if len(app['builds']) == 0:
|
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 'subdir' in app['builds'][-1]:
|
|
||||||
build_dir = os.path.join(build_dir, app['builds'][-1]['subdir'])
|
|
||||||
|
|
||||||
version, vercode, package = common.parse_androidmanifest(build_dir)
|
version, vercode, package = common.parse_androidmanifest(build_dir)
|
||||||
if not package:
|
if not package:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue