aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThibault Saunier <thibault.saunier@osg.samsung.com>2017-03-23 16:59:02 -0300
committerJussi Pakkanen <jpakkane@gmail.com>2017-03-25 17:55:15 +0200
commit650ad9dc8875ddfc0a0db31cbca4111ada40c556 (patch)
tree397f03988a4cc680973540606cc350920c588c4e
parent3f8b010670b2bbd15383d7a754716e8ca4b3382c (diff)
downloadmeson-650ad9dc8875ddfc0a0db31cbca4111ada40c556.zip
meson-650ad9dc8875ddfc0a0db31cbca4111ada40c556.tar.gz
meson-650ad9dc8875ddfc0a0db31cbca4111ada40c556.tar.bz2
Never accept a directory as being an executable program
Otherwise we will possibly use a subfolder with the name an executable we are looking for as an executable
-rw-r--r--mesonbuild/dependencies.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/mesonbuild/dependencies.py b/mesonbuild/dependencies.py
index e4317f1..031e106 100644
--- a/mesonbuild/dependencies.py
+++ b/mesonbuild/dependencies.py
@@ -456,7 +456,7 @@ class ExternalProgram:
if suffix in self.windows_exts:
return True
elif os.access(path, os.X_OK):
- return True
+ return not os.path.isdir(path)
return False
def _search_dir(self, name, search_dir):