diff options
| -rw-r--r-- | mesonbuild/backend/backends.py | 1 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/__init__.py | 1 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/rpm.py | 2 | ||||
| -rw-r--r-- | mesonbuild/wrap/wrap.py | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index e8d6beb..8b6d181 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -16,6 +16,7 @@ import os, pickle, re from .. import build from .. import dependencies from .. import mesonlib +from .. import mlog from .. import compilers import json import subprocess diff --git a/mesonbuild/backend/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index 332450f..6a6782e 100644 --- a/mesonbuild/backend/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -251,7 +251,7 @@ int dummy; # either in the source root, or generated with configure_file and # in the build root if not isinstance(s, File): - raise InvalidArguments('All sources in target {!r} must be of type mesonlib.File'.format(t)) + raise InvalidArguments('All sources in target {!r} must be of type mesonlib.File'.format(s)) f = s.rel_to_builddir(self.build_to_src) srcs[f] = s return srcs diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py index 8986d7a..085b4dd 100644 --- a/mesonbuild/modules/__init__.py +++ b/mesonbuild/modules/__init__.py @@ -1,5 +1,6 @@ from .. import build from .. import dependencies +from ..mesonlib import MesonException _found_programs = {} diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 9b606f3..3a991e9 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -696,7 +696,7 @@ can not be used with the current version of glib-compiled-resources, due to args += self._unpack_args('--ignore-headers=', 'ignore_headers', kwargs) args += self._unpack_args('--installdir=', 'install_dir', kwargs, state) args += self._get_build_args(kwargs, state) - res = [build.RunTarget(targetname, command[0], command[1:] + sargs, [], state.subdir)] + res = [build.RunTarget(targetname, command[0], command[1:] + args, [], state.subdir)] if kwargs.get('install', True): res.append(build.InstallScript(command, args)) return res diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py index a0f79aa..e3c45c0 100644 --- a/mesonbuild/modules/rpm.py +++ b/mesonbuild/modules/rpm.py @@ -103,7 +103,7 @@ class RPMModule: mlog.bold('dnf provides %s' % lib.fullpath)) for prog in state.environment.coredata.ext_progs.values(): if not prog.found(): - fn.write('BuildRequires: %{_bindir}/%s # FIXME\n' % + fn.write('BuildRequires: %%{_bindir}/%s # FIXME\n' % prog.get_name()) else: fn.write('BuildRequires: %s\n' % ' '.join(prog.fullpath)) diff --git a/mesonbuild/wrap/wrap.py b/mesonbuild/wrap/wrap.py index 37d6df7..3db3f9b 100644 --- a/mesonbuild/wrap/wrap.py +++ b/mesonbuild/wrap/wrap.py @@ -100,7 +100,7 @@ class Resolver: else: mlog.warning('Subproject directory %s is empty, possibly because of an unfinished' 'checkout, removing to reclone' % dirname) - os.rmdir(checkoutdir) + os.rmdir(dirname) except NotADirectoryError: raise RuntimeError('%s is not a directory, can not use as subproject.' % dirname) except FileNotFoundError: |