From 083eab579f80bda3bed9c5f97a26b415c31a5dbf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Sun, 9 Feb 2014 19:11:15 +0100 Subject: [PATCH] Check for subdir after doing submodules --- fdroidserver/common.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 7533149e..4f3b35ee 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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']) 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 if build['submodules']: logging.info("Initialising submodules") 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 if 'init' in build: cmd = replace_config_vars(build['init']) -- 2.30.2