aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mensinger <daniel@mensinger-ka.de>2019-02-18 15:01:49 +0100
committerDaniel Mensinger <daniel@mensinger-ka.de>2019-02-26 09:33:26 +0100
commitbc25a12709e97b915027162422cbb571df3e826a (patch)
tree79f25ae40d478790e0553b91fab3127717c5bee9
parent1dfa3783f50afffe1f537c482e856a2a5a40fc1c (diff)
downloadmeson-bc25a12709e97b915027162422cbb571df3e826a.zip
meson-bc25a12709e97b915027162422cbb571df3e826a.tar.gz
meson-bc25a12709e97b915027162422cbb571df3e826a.tar.bz2
Minor code fixes
-rw-r--r--mesonbuild/dependencies/base.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/dependencies/base.py b/mesonbuild/dependencies/base.py
index 44c3ef2..b25927c 100644
--- a/mesonbuild/dependencies/base.py
+++ b/mesonbuild/dependencies/base.py
@@ -1111,18 +1111,18 @@ class CMakeDependency(ExternalDependency):
@staticmethod
@functools.lru_cache(maxsize=None)
- def _cached_listdir(path: str) -> List[Tuple[str, str]]:
+ def _cached_listdir(path: str) -> Tuple[Tuple[str, str]]:
try:
- return [(x, str(x).lower()) for x in os.listdir(path)]
- except:
- return []
+ return tuple([(x, str(x).lower()) for x in os.listdir(path)])
+ except OSError:
+ return ()
@staticmethod
@functools.lru_cache(maxsize=None)
def _cached_isdir(path: str) -> bool:
try:
return os.path.isdir(path)
- except:
+ except OSError:
return False
def _preliminary_find_check(self, name: str, module_path: List[str]) -> bool: