aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/environment.py
diff options
context:
space:
mode:
authorHemmo Nieminen <hemmo.nieminen@iki.fi>2016-03-22 19:31:55 +0200
committerHemmo Nieminen <hemmo.nieminen@iki.fi>2016-04-01 00:52:45 +0300
commit336904b55309c9b5f14e4511655af6028e04c03d (patch)
tree940541514425aa38e940ef4ed4c1289d66c259b3 /mesonbuild/environment.py
parent5764bee2f42260c2869986b197fdccadac071257 (diff)
downloadmeson-336904b55309c9b5f14e4511655af6028e04c03d.zip
meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.gz
meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.bz2
Move MesonException from coredata to mesonlib.
Diffstat (limited to 'mesonbuild/environment.py')
-rw-r--r--mesonbuild/environment.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index c381ab5..3b5fb98 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -19,7 +19,7 @@ import configparser
build_filename = 'meson.build'
-class EnvironmentException(coredata.MesonException):
+class EnvironmentException(mesonlib.MesonException):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
@@ -657,11 +657,11 @@ class CrossBuildInfo():
if 'target_machine' in self.config:
return
if not 'host_machine' in self.config:
- raise coredata.MesonException('Cross info file must have either host or a target machine.')
+ raise mesonlib.MesonException('Cross info file must have either host or a target machine.')
if not 'properties' in self.config:
- raise coredata.MesonException('Cross file is missing "properties".')
+ raise mesonlib.MesonException('Cross file is missing "properties".')
if not 'binaries' in self.config:
- raise coredata.MesonException('Cross file is missing "binaries".')
+ raise mesonlib.MesonException('Cross file is missing "binaries".')
def ok_type(self, i):
return isinstance(i, str) or isinstance(i, int) or isinstance(i, bool)