aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2015-08-14 01:24:11 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2015-08-14 01:24:11 +0300
commite842e6602c3a0e5aeac5ecfb4d8bb4fe7bc75093 (patch)
tree7cf0a0831c17c7c3af1fcc22ba9d3143844751dc
parent05d929d542890df227584740cb33fa22334fdb4b (diff)
downloadmeson-e842e6602c3a0e5aeac5ecfb4d8bb4fe7bc75093.zip
meson-e842e6602c3a0e5aeac5ecfb4d8bb4fe7bc75093.tar.gz
meson-e842e6602c3a0e5aeac5ecfb4d8bb4fe7bc75093.tar.bz2
A few tweaks.
-rw-r--r--interpreter.py3
-rw-r--r--modules/gnome.py2
2 files changed, 3 insertions, 2 deletions
diff --git a/interpreter.py b/interpreter.py
index 78cbf86..3c66f86 100644
--- a/interpreter.py
+++ b/interpreter.py
@@ -1577,7 +1577,8 @@ class Interpreter():
raise InterpreterException('Argument "configuration" is not of type configuration_data')
conffile = os.path.join(self.subdir, inputfile)
- self.build_def_files.append(conffile)
+ if conffile not in self.build_def_files:
+ self.build_def_files.append(conffile)
os.makedirs(os.path.join(self.environment.build_dir, self.subdir), exist_ok=True)
ifile_abs = os.path.join(self.environment.source_dir, self.subdir, inputfile)
ofile_abs = os.path.join(self.environment.build_dir, self.subdir, output)
diff --git a/modules/gnome.py b/modules/gnome.py
index f9cd56d..fc3f408 100644
--- a/modules/gnome.py
+++ b/modules/gnome.py
@@ -62,7 +62,7 @@ class GnomeModule:
scan_command += ['--namespace='+ns, '--nsversion=' + nsversion, '--warn-all',
'--output', '@OUTPUT@']
- extra_args = kwargs.get('extra_args', [])
+ extra_args = kwargs.pop('extra_args', [])
if not isinstance(extra_args, list):
extra_args = [extra_args]
scan_command += extra_args