diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 13:14:25 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-02-21 13:14:25 +0200 |
| commit | 0469128f46f9d7239426868b168323d0d5adb9b8 (patch) | |
| tree | 06fd552219a8e37ec25d14d7431fa3628f2bc8d7 /mesonbuild/coredata.py | |
| parent | f74d6201eb1bd36f666604fa301922b5183ef14e (diff) | |
| download | meson-0469128f46f9d7239426868b168323d0d5adb9b8.tar.gz | |
Preserve 'C:\' as an absolute path in prefix.
Diffstat (limited to 'mesonbuild/coredata.py')
| -rw-r--r-- | mesonbuild/coredata.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mesonbuild/coredata.py b/mesonbuild/coredata.py index c12477fd6..0cfa2797c 100644 --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py @@ -60,11 +60,9 @@ class UserStringOption(UserOption): def validate(self, value): if not isinstance(value, str): - raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(newvalue), self.name)) - if self.name == 'prefix': - if not os.path.isabs(value): - if len(value) >= 2 and value[1] != ':': - raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value)) + raise MesonException('Value "%s" for string option "%s" is not a string.' % (str(value), self.name)) + if self.name == 'prefix' and not os.path.isabs(value): + raise MesonException('Prefix option value \'{0}\' must be an absolute path.'.format(value)) if self.name in ('libdir', 'bindir', 'includedir', 'datadir', 'mandir', 'localedir') \ and os.path.isabs(value): raise MesonException('Option %s must not be an absolute path.' % self.name) |
