diff options
author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-03-22 19:31:55 +0200 |
---|---|---|
committer | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2016-04-01 00:52:45 +0300 |
commit | 336904b55309c9b5f14e4511655af6028e04c03d (patch) | |
tree | 940541514425aa38e940ef4ed4c1289d66c259b3 /mesonbuild/modules/pkgconfig.py | |
parent | 5764bee2f42260c2869986b197fdccadac071257 (diff) | |
download | meson-336904b55309c9b5f14e4511655af6028e04c03d.zip meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.gz meson-336904b55309c9b5f14e4511655af6028e04c03d.tar.bz2 |
Move MesonException from coredata to mesonlib.
Diffstat (limited to 'mesonbuild/modules/pkgconfig.py')
-rw-r--r-- | mesonbuild/modules/pkgconfig.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index ffe03e2..fe5ca45 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -55,7 +55,7 @@ class PkgConfigModule: def generate(self, state, args, kwargs): if len(args) > 0: - raise coredata.MesonException('Pkgconfig_gen takes no positional arguments.') + raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.') libs = kwargs.get('libraries', []) if not isinstance(libs, list): libs = [libs] @@ -64,22 +64,22 @@ class PkgConfigModule: if hasattr(l, 'held_object'): l = l.held_object if not (isinstance(l, build.SharedLibrary) or isinstance(l, build.StaticLibrary)): - raise coredata.MesonException('Library argument not a library object.') + raise mesonlib.MesonException('Library argument not a library object.') processed_libs.append(l) libs = processed_libs subdirs = mesonlib.stringlistify(kwargs.get('subdirs', ['.'])) version = kwargs.get('version', '') if not isinstance(version, str): - raise coredata.MesonException('Version must be a string.') + raise mesonlib.MesonException('Version must be a string.') name = kwargs.get('name', None) if not isinstance(name, str): - raise coredata.MesonException('Name not specified.') + raise mesonlib.MesonException('Name not specified.') filebase = kwargs.get('filebase', name) if not isinstance(filebase, str): - raise coredata.MesonException('Filebase must be a string.') + raise mesonlib.MesonException('Filebase must be a string.') description = kwargs.get('description', None) if not isinstance(description, str): - raise coredata.MesonException('Description is not a string.') + raise mesonlib.MesonException('Description is not a string.') pub_reqs = mesonlib.stringlistify(kwargs.get('requires', [])) priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) priv_libs = mesonlib.stringlistify(kwargs.get('libraries_private', [])) |