diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2017-07-04 09:15:00 +1000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-02-22 20:26:16 +0200 |
| commit | 6b550ae91f166a5c5161ab23c500760a9a155909 (patch) | |
| tree | 50a3a690dde0bf60318855c76c70b0493b94a188 /mesonbuild/backend/ninjabackend.py | |
| parent | c572d222daf141656f6fe8119f1bd5bfc5fbe63e (diff) | |
| download | meson-6b550ae91f166a5c5161ab23c500760a9a155909.zip meson-6b550ae91f166a5c5161ab23c500760a9a155909.tar.gz meson-6b550ae91f166a5c5161ab23c500760a9a155909.tar.bz2 | |
Allow for missing install_dir in install_data()
The documentation doesn't require it and the interpreter code works around the
possibility of it being None. The ninja backend code however fails with
File "/home/whot/code/meson/mesonbuild/backend/ninjabackend.py", line 796, in generate_data_install
dstabs = os.path.join(subdir or None, plain_f)
File "/usr/lib64/python3.6/posixpath.py", line 78, in join
a = os.fspath(a)
TypeError: expected str, bytes or os.PathLike object, not NoneType
If install_dir is missing, default to datadir/projectname
Diffstat (limited to 'mesonbuild/backend/ninjabackend.py')
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index b9f614e..59eaf6b 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -839,6 +839,8 @@ int dummy; for de in data: assert(isinstance(de, build.Data)) subdir = de.install_dir + if not subdir: + subdir = os.path.join(self.environment.get_datadir(), self.interpreter.build.project_name) for f in de.sources: assert(isinstance(f, mesonlib.File)) plain_f = os.path.basename(f.fname) |