diff options
author | Xavier Claessens <xavier.claessens@collabora.com> | 2018-05-13 10:36:58 -0400 |
---|---|---|
committer | Xavier Claessens <xavier.claessens@collabora.com> | 2018-08-22 15:15:54 -0400 |
commit | 55bbb3600f46d2e78da2b3de835f2814084f03b2 (patch) | |
tree | 9a005bd7dd51712b79bbc597b735ce3b87eb7019 | |
parent | bef8187e43204cb26b4549ffc1d2bdd3351ac957 (diff) | |
download | meson-55bbb3600f46d2e78da2b3de835f2814084f03b2.zip meson-55bbb3600f46d2e78da2b3de835f2814084f03b2.tar.gz meson-55bbb3600f46d2e78da2b3de835f2814084f03b2.tar.bz2 |
mesonmain: Use MesonException instead of RuntimeError in MesonApp init
-rw-r--r-- | mesonbuild/mesonmain.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 68a2ddb..4503018 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -71,18 +71,18 @@ class MesonApp: if not os.path.exists(ndir2): os.makedirs(ndir2) if not stat.S_ISDIR(os.stat(ndir1).st_mode): - raise RuntimeError('%s is not a directory' % dir1) + raise MesonException('%s is not a directory' % dir1) if not stat.S_ISDIR(os.stat(ndir2).st_mode): - raise RuntimeError('%s is not a directory' % dir2) + raise MesonException('%s is not a directory' % dir2) if os.path.samefile(dir1, dir2): - raise RuntimeError('Source and build directories must not be the same. Create a pristine build directory.') + raise MesonException('Source and build directories must not be the same. Create a pristine build directory.') if self.has_build_file(ndir1): if self.has_build_file(ndir2): - raise RuntimeError('Both directories contain a build file %s.' % environment.build_filename) + raise MesonException('Both directories contain a build file %s.' % environment.build_filename) return ndir1, ndir2 if self.has_build_file(ndir2): return ndir2, ndir1 - raise RuntimeError('Neither directory contains a build file %s.' % environment.build_filename) + raise MesonException('Neither directory contains a build file %s.' % environment.build_filename) def validate_dirs(self, dir1, dir2, handshake): (src_dir, build_dir) = self.validate_core_dirs(dir1, dir2) |