Sandro Bonazzola has uploaded a new change for review. Change subject: validation: fix pyflakes and pep8 ......................................................................
validation: fix pyflakes and pep8 Fix issues detected by pyflakes and pep8 1.6.2 Change-Id: I8cbdc366269cbc251dd776d51c2fa8952142b1bc Signed-off-by: Sandro Bonazzola <sbona...@redhat.com> --- M packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py M packaging/setup/ovirt_engine_setup/dwh/constants.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/config.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/single_etl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/single_etl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py 22 files changed, 107 insertions(+), 45 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/07/39507/1 diff --git a/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py b/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py index 7be6e43..800dc33 100755 --- a/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py +++ b/packaging/services/ovirt-engine-dwhd/ovirt-engine-dwhd.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2012-2013 Red Hat +# Copyright 2012-2015 Red Hat # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import shlex import subprocess import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') import config @@ -32,6 +31,10 @@ from ovirt_engine import java +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + class Daemon(service.Daemon): def __init__(self): diff --git a/packaging/setup/ovirt_engine_setup/dwh/constants.py b/packaging/setup/ovirt_engine_setup/dwh/constants.py index ecf2c35..b28725e 100644 --- a/packaging/setup/ovirt_engine_setup/dwh/constants.py +++ b/packaging/setup/ovirt_engine_setup/dwh/constants.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -35,6 +34,10 @@ from . import config +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export @util.codegen class Const(object): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py index c19275e..a4be876 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -28,6 +27,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py index 29b64d5..aaac42d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -28,6 +27,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/config.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/config.py index c83b20c..115648a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/config.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/config.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Config plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py index fa31740..dc71c76 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/connection.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -36,6 +35,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py index 424db2a..7e3ce3c 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/engine_connection.py @@ -20,23 +20,27 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons -from otopi import transaction -from otopi import util from otopi import plugin +from otopi import util from ovirt_engine import configfile from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.dwh import constants as odwhcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup.engine_common \ import constants as oengcommcons + + +from ovirt_engine_setup.dwh import constants as odwhcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') @util.export @@ -49,7 +53,6 @@ @plugin.event( stage=plugin.Stages.STAGE_BOOT, ) - def _boot(self): self.environment[ otopicons.CoreEnv.LOG_FILTER_KEYS diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py index 7e29052..a8945a7 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/db/pgpass.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """DB pgpass plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py index e71786b..e005be6 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -28,6 +27,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py index b3e748b..8566e76 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/clear.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Clear plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/single_etl.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/single_etl.py index e7d0464..c19f4df 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/single_etl.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-dwh/db/single_etl.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -29,6 +28,10 @@ engine_db_timekeeping +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py index 9a615ed..050293b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/check_etl.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,7 +18,6 @@ import re import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -29,6 +28,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py index e613ebb..03d7bd5 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -36,6 +35,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Databsae plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py index b15c3fa..0d08676 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/misc.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -29,6 +28,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py index c226606..fe9c413 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/service.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -28,6 +27,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/single_etl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/single_etl.py index 8096811..08ed841 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/single_etl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/single_etl.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2014 Red Hat, Inc. +# Copyright (C) 2014-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -34,6 +33,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py index 00e0ac1..905ce15 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/connection.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013-2014 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -35,6 +34,10 @@ import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py index 072f69a..4eca7ee 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/engine_connection.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -29,16 +28,16 @@ from otopi import plugin -from ovirt_engine import configfile - - -from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.dwh import constants as odwhcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup.engine_common \ import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py index f0e0ea1..38d28af 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/db/schema.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -38,6 +37,10 @@ import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Schema plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py index f3c8ae4..fa64db2 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/distro-rpm/packages.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.dwh import constants as odwhcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py index 7f943bb..ee3cd45 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -22,7 +22,6 @@ import configparser import io import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import constants as otopicons @@ -39,6 +38,10 @@ from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py index 5636e2c..500c7a0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/provisioning/postgres.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-2015 Red Hat, Inc. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-dwh') from otopi import util @@ -35,6 +34,10 @@ import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-dwh') + + @util.export class Plugin(plugin.PluginBase): """Local Postgres plugin.""" -- To view, visit https://gerrit.ovirt.org/39507 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8cbdc366269cbc251dd776d51c2fa8952142b1bc Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches