aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/modules/gnome.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2017-01-03 16:04:24 -0500
committerGitHub <noreply@github.com>2017-01-03 16:04:24 -0500
commit56e2c46ce1cb1ffb4f0fe56c6462954dd00f33c4 (patch)
tree5c21f10908d00cf9c74d9d386380c42cff73060f /mesonbuild/modules/gnome.py
parent55cdba635e61b68658e0d209a58cfb2f1537df93 (diff)
parentef3cc6b3fabb1032066e7c8ecfd67dc4e1169193 (diff)
downloadmeson-56e2c46ce1cb1ffb4f0fe56c6462954dd00f33c4.zip
meson-56e2c46ce1cb1ffb4f0fe56c6462954dd00f33c4.tar.gz
meson-56e2c46ce1cb1ffb4f0fe56c6462954dd00f33c4.tar.bz2
Merge pull request #1272 from mesonbuild/ignatenko/lint
fix some linting errors
Diffstat (limited to 'mesonbuild/modules/gnome.py')
-rw-r--r--mesonbuild/modules/gnome.py15
1 files changed, 7 insertions, 8 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 3f88585..f7aa0f2 100644
--- a/mesonbuild/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
@@ -593,15 +593,15 @@ can not be used with the current version of glib-compiled-resources, due to
'--id=' + project_id,
'--sources=' + source_str]
pottarget = build.RunTarget('help-' + project_id + '-pot', sys.executable,
- potargs, [], state.subdir)
+ potargs, [], state.subdir)
poargs = [state.environment.get_build_command(), '--internal', 'yelphelper', 'update-po',
- '--subdir=' + state.subdir,
- '--id=' + project_id,
- '--sources=' + source_str,
- '--langs=' + '@@'.join(langs)]
+ '--subdir=' + state.subdir,
+ '--id=' + project_id,
+ '--sources=' + source_str,
+ '--langs=' + '@@'.join(langs)]
potarget = build.RunTarget('help-' + project_id + '-update-po', sys.executable,
- poargs, [], state.subdir)
+ poargs, [], state.subdir)
return [inscript, pottarget, potarget]
@@ -1015,8 +1015,7 @@ can not be used with the current version of glib-compiled-resources, due to
for i in inputs:
if isinstance(i, str):
cmd.append(os.path.join(source_dir, i))
- elif hasattr(i, 'held_object') \
- and isinstance(i.held_object, GirTarget):
+ elif hasattr(i, 'held_object') and isinstance(i.held_object, GirTarget):
link_with += self._get_vapi_link_with(i.held_object)
subdir = os.path.join(state.environment.get_build_dir(),
i.held_object.get_subdir())