mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-06 15:30:28 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Check for subdir after doing submodules

Browse source
This commit is contained in:
Daniel Martí 2014-02-09 19:11:15 +01:00
parent d949b9ffbb
commit 083eab579f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
fdroidserver/common.py
View file

@ -864,16 +864,16 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
logging.info("Getting source for revision " + build['commit']) logging.info("Getting source for revision " + build['commit'])
vcs.gotorevision(build['commit']) vcs.gotorevision(build['commit'])
# Check that a subdir (if we're using one) exists. This has to happen
# after the checkout, since it might not exist elsewhere
if not os.path.exists(root_dir):
raise BuildException('Missing subdir ' + root_dir)
# Initialise submodules if requred # Initialise submodules if requred
if build['submodules']: if build['submodules']:
logging.info("Initialising submodules") logging.info("Initialising submodules")
vcs.initsubmodules() vcs.initsubmodules()
# Check that a subdir (if we're using one) exists. This has to happen
# after the checkout, since it might not exist elsewhere
if not os.path.exists(root_dir):
raise BuildException('Missing subdir ' + root_dir)
# Run an init command if one is required # Run an init command if one is required
if 'init' in build: if 'init' in build:
cmd = replace_config_vars(build['init']) cmd = replace_config_vars(build['init'])