aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-02-06 18:58:37 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2015-02-06 18:58:37 +0200
commit201664b2b8a592675414f87a5445ce1d7297b02e (patch)
treee5a2d03d3d428d0b36f6fce79c01fa60395037dd
parent67ddeb8a01d094f6826d967ea8f2c9f9c35e745e (diff)
downloadmeson-201664b2b8a592675414f87a5445ce1d7297b02e.zip
meson-201664b2b8a592675414f87a5445ce1d7297b02e.tar.gz
meson-201664b2b8a592675414f87a5445ce1d7297b02e.tar.bz2
Make directories in build tree, too.
-rw-r--r--interpreter.py1
-rw-r--r--wrap.py2
2 files changed, 2 insertions, 1 deletions
diff --git a/interpreter.py b/interpreter.py
index 33dbbef..e682387 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -922,6 +922,7 @@ class Interpreter():
raise InterpreterException('Subproject directory does not exist and can not be downloaded.')
subdir = os.path.join('subprojects', resolved)
abs_subdir = os.path.join(self.build.environment.get_source_dir(), 'subprojects', subdir)
+ os.makedirs(os.path.join(self.build.environment.get_build_dir(), subdir), exist_ok=True)
self.global_args_frozen = True
mlog.log('\nExecuting subproject ', mlog.bold(dirname), '.\n', sep='')
subi = Interpreter(self.build, dirname, subdir)
diff --git a/wrap.py b/wrap.py
index 2c3e087..af2b213 100644
--- a/wrap.py
+++ b/wrap.py
@@ -79,7 +79,7 @@ class Resolver:
(pdata, phash) = self.get_data(purl)
expected = p.get('patch_hash')
if phash != expected:
- raise RuntimeError('Incorrect hash for patch %s:\n %s expected\n %s actual.' % (packagename, expected, phash))
+ raise RuntimeError('Incorrect hash for patch %s:\n %s expected\n %s actual' % (packagename, expected, phash))
open(os.path.join(self.cachedir, p.get('patch_filename')), 'wb').write(pdata)
else:
mlog.log('Package does not require patch.')