diff options
author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-19 03:19:13 +0530 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-02-19 03:49:31 +0530 |
commit | 7e805a019ae4d923403af8032776c0c302e3a50c (patch) | |
tree | f235ff5c0039b8e43469dce0d9606bb30a722595 /mesonbuild/interpreter.py | |
parent | 280346da3ac5904ec097afe89ef45ad34bd4a173 (diff) | |
download | meson-7e805a019ae4d923403af8032776c0c302e3a50c.zip meson-7e805a019ae4d923403af8032776c0c302e3a50c.tar.gz meson-7e805a019ae4d923403af8032776c0c302e3a50c.tar.bz2 |
find_program: Fix implementation of .path()
And actually test that prog.path() works. The earlier test was just
running the command without checking if it succeeded.
Also make everything use prog.get_command() or get_path() instead of
accessing the internal member prog.fullpath directly.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 963cc69..bae42a4 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -285,16 +285,16 @@ class ExternalProgramHolder(InterpreterObject): return self.found() def path_method(self, args, kwargs): - return self.get_command() + return self.held_object.get_path() def found(self): return self.held_object.found() def get_command(self): - return self.held_object.fullpath + return self.held_object.get_command() def get_name(self): - return self.held_object.name + return self.held_object.get_name() class ExternalLibraryHolder(InterpreterObject): def __init__(self, el): |