diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-01-03 16:04:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-03 16:04:24 -0500 |
| commit | 56e2c46ce1cb1ffb4f0fe56c6462954dd00f33c4 (patch) | |
| tree | 5c21f10908d00cf9c74d9d386380c42cff73060f /mesonbuild/modules | |
| parent | 55cdba635e61b68658e0d209a58cfb2f1537df93 (diff) | |
| parent | ef3cc6b3fabb1032066e7c8ecfd67dc4e1169193 (diff) | |
| download | meson-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')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 15 | ||||
| -rw-r--r-- | mesonbuild/modules/i18n.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/qt4.py | 6 | ||||
| -rw-r--r-- | mesonbuild/modules/qt5.py | 6 |
4 files changed, 14 insertions, 15 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()) diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 097eedd..4b4ae3d 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -105,7 +105,7 @@ class I18nModule: updatepoargs.append(extra_args) updatepotarget = build.RunTarget(packagename + '-update-po', sys.executable, updatepoargs, [], state.subdir) - script = [sys.executable, state.environment.get_build_command()] + script = [sys.executable, state.environment.get_build_command()] args = ['--internal', 'gettext', 'install', '--subdir=' + state.subdir, '--localedir=' + state.environment.coredata.get_builtin_option('localedir'), diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 8670533..beb7ca5 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -44,7 +44,7 @@ class Qt4Module(): moc_ver = stderr else: raise MesonException('Moc preprocessor is not for Qt 4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.moc.fullpath), moc_ver.split()[-1])) else: @@ -57,7 +57,7 @@ class Qt4Module(): uic_ver = stderr else: raise MesonException('Uic compiler is not for Qt4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.uic.fullpath), uic_ver.split()[-1])) else: @@ -70,7 +70,7 @@ class Qt4Module(): rcc_ver = stderr else: raise MesonException('Rcc compiler is not for Qt 4. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\ % (' '.join(self.rcc.fullpath), rcc_ver.split()[-1])) else: diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index 7a9f8f5..2e348db 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -46,7 +46,7 @@ class Qt5Module(): moc_ver = stdout else: raise MesonException('Moc preprocessor is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' moc:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.moc.fullpath), moc_ver.split()[-1])) else: @@ -61,7 +61,7 @@ class Qt5Module(): uic_ver = stdout else: raise MesonException('Uic compiler is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' uic:', mlog.green('YES'), '(%s, %s)' % \ (' '.join(self.uic.fullpath), uic_ver.split()[-1])) else: @@ -76,7 +76,7 @@ class Qt5Module(): rcc_ver = stdout else: raise MesonException('Rcc compiler is not for Qt 5. Output:\n%s\n%s' % - (stdout, stderr)) + (stdout, stderr)) mlog.log(' rcc:', mlog.green('YES'), '(%s, %s)'\ % (' '.join(self.rcc.fullpath), rcc_ver.split()[-1])) else: |