Simone Tiraboschi has uploaded a new change for review. Change subject: build: fix recent pep8 warnings ......................................................................
build: fix recent pep8 warnings Fixed errors detected with pep8 1.6.2: E402 module level import not at top of file. E731 do not assign a lambda expression, use a def Change-Id: I0b6ee66fb522e542e567c4024cbd8c6ad169d378 Signed-off-by: Simone Tiraboschi <[email protected]> --- M build/helptag.py M packaging/pythonlib/ovirt_engine/configfile.py M packaging/pythonlib/ovirt_engine/java.py M packaging/pythonlib/ovirt_engine/service.py M packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py M packaging/services/ovirt-engine/ovirt-engine.py M packaging/services/ovirt-fence-kdump-listener/db.py M packaging/services/ovirt-fence-kdump-listener/listener.py M packaging/services/ovirt-fence-kdump-listener/ovirt-fence-kdump-listener.py M packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.py M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/ovirt_engine_setup/dialog.py M packaging/setup/ovirt_engine_setup/domains.py M packaging/setup/ovirt_engine_setup/engine/constants.py M packaging/setup/ovirt_engine_setup/engine/vdcoption.py M packaging/setup/ovirt_engine_setup/engine_common/constants.py M packaging/setup/ovirt_engine_setup/engine_common/database.py M packaging/setup/ovirt_engine_setup/engine_common/dwh_history_timekeeping.py M packaging/setup/ovirt_engine_setup/engine_common/postgres.py M packaging/setup/ovirt_engine_setup/hostname.py M packaging/setup/ovirt_engine_setup/remote_engine.py M packaging/setup/ovirt_engine_setup/util.py M packaging/setup/ovirt_engine_setup/websocket_proxy/constants.py M packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py M packaging/setup/plugins/ovirt-engine-common/base/core/misc.py M packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py M packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.py M packaging/setup/plugins/ovirt-engine-common/base/core/reconfigure.py M packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.py M packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py M packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.py M packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.py M packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.py M packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.py M packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py M packaging/setup/plugins/ovirt-engine-common/base/network/hostname.py M packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py M packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py M packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.py M packaging/setup/plugins/ovirt-engine-common/base/system/mem.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/provisioning/postgres.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/fence_kdump_listener.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/config.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py M packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py M packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py M packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py M packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py M packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-common/system/sysctl.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/misc.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py M packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/fence_kdump_listener.py M packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py M packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py M packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/base/dialog/preview.py M packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py M packaging/setup/plugins/ovirt-engine-setup/base/system/environment.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/system/sysctl.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsmi.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/storage.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/image_upload.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/packages.py M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py 126 files changed, 646 insertions(+), 315 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/38487/1 diff --git a/build/helptag.py b/build/helptag.py index 32f3b08..9c82ef7 100644 --- a/build/helptag.py +++ b/build/helptag.py @@ -9,14 +9,12 @@ import os import re import sys +import configparser if sys.version_info[0] < 3: import ConfigParser sys.modules['configparser'] = ConfigParser - - -import configparser COMMAND_DIFF = 'diff' diff --git a/packaging/pythonlib/ovirt_engine/configfile.py b/packaging/pythonlib/ovirt_engine/configfile.py index 2a7416e..fcc98a2 100644 --- a/packaging/pythonlib/ovirt_engine/configfile.py +++ b/packaging/pythonlib/ovirt_engine/configfile.py @@ -1,5 +1,5 @@ # -# Copyright 2013 Red Hat +# 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. @@ -19,12 +19,15 @@ import re import glob import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') from . import base +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + class ConfigFile(base.Base): """ Parsing of shell style config file. diff --git a/packaging/pythonlib/ovirt_engine/java.py b/packaging/pythonlib/ovirt_engine/java.py index c72ba08..1501379 100644 --- a/packaging/pythonlib/ovirt_engine/java.py +++ b/packaging/pythonlib/ovirt_engine/java.py @@ -1,5 +1,5 @@ # -# Copyright 2013 Red Hat +# 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. @@ -18,13 +18,16 @@ import os import subprocess import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') from . import base from . import config +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + class Java(base.Base): def __init__(self): diff --git a/packaging/pythonlib/ovirt_engine/service.py b/packaging/pythonlib/ovirt_engine/service.py index 8067316..05365cc 100644 --- a/packaging/pythonlib/ovirt_engine/service.py +++ b/packaging/pythonlib/ovirt_engine/service.py @@ -1,5 +1,5 @@ # -# Copyright 2013-2014 Red Hat +# 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. @@ -28,7 +28,6 @@ import tempfile import resource import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') import daemon @@ -38,6 +37,10 @@ from . import util +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + @util.export def setupLogger(): class _MyFormatter(logging.Formatter): diff --git a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py index a4ba074..b114102 100755 --- a/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py +++ b/packaging/services/ovirt-engine-notifier/ovirt-engine-notifier.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2012 Red Hat +# Copyright (C) 2012-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 subprocess import sys import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') import config @@ -31,6 +30,10 @@ from ovirt_engine import java +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + class Daemon(service.Daemon): def __init__(self): diff --git a/packaging/services/ovirt-engine/ovirt-engine.py b/packaging/services/ovirt-engine/ovirt-engine.py index 3735388..c20643a 100755 --- a/packaging/services/ovirt-engine/ovirt-engine.py +++ b/packaging/services/ovirt-engine/ovirt-engine.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2012 Red Hat +# Copyright (C) 2012-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 re import shlex import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') from Cheetah.Template import Template @@ -34,6 +33,10 @@ from ovirt_engine import java +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + class Daemon(service.Daemon): def __init__(self): diff --git a/packaging/services/ovirt-fence-kdump-listener/db.py b/packaging/services/ovirt-fence-kdump-listener/db.py index 85ca312..823bcff 100644 --- a/packaging/services/ovirt-fence-kdump-listener/db.py +++ b/packaging/services/ovirt-fence-kdump-listener/db.py @@ -1,4 +1,4 @@ -# Copyright 2014 Red Hat +# 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. @@ -21,7 +21,8 @@ from ovirt_engine import base -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-fence-kdump-listener') +def _(m): + return gettext.dgettext(message=m, domain='ovirt-fence-kdump-listener') class DbManager(base.Base): diff --git a/packaging/services/ovirt-fence-kdump-listener/listener.py b/packaging/services/ovirt-fence-kdump-listener/listener.py index 2b5372d..295dc0d 100644 --- a/packaging/services/ovirt-fence-kdump-listener/listener.py +++ b/packaging/services/ovirt-fence-kdump-listener/listener.py @@ -1,4 +1,4 @@ -# Copyright 2014 Red Hat +# 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. @@ -24,7 +24,8 @@ from ovirt_engine import base -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-fence-kdump-listener') +def _(m): + return gettext.dgettext(message=m, domain='ovirt-fence-kdump-listener') class FenceKdumpListener(base.Base): diff --git a/packaging/services/ovirt-fence-kdump-listener/ovirt-fence-kdump-listener.py b/packaging/services/ovirt-fence-kdump-listener/ovirt-fence-kdump-listener.py index 552840b..7e51954 100755 --- a/packaging/services/ovirt-fence-kdump-listener/ovirt-fence-kdump-listener.py +++ b/packaging/services/ovirt-fence-kdump-listener/ovirt-fence-kdump-listener.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2014 Red Hat +# 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. @@ -28,7 +28,8 @@ from ovirt_engine import service -_ = lambda m: gettext.dgettext(message=m, domain="ovirt-fence-kdump-listener") +def _(m): + return gettext.dgettext(message=m, domain="ovirt-fence-kdump-listener") class Daemon(service.Daemon): diff --git a/packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.py b/packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.py index a1057f5..7916462 100755 --- a/packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.py +++ b/packaging/services/ovirt-websocket-proxy/ovirt-websocket-proxy.py @@ -1,6 +1,6 @@ #!/usr/bin/python -# Copyright 2013 Red Hat +# 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 import json import urllib -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine') import websockify @@ -34,6 +33,10 @@ from ovirt_engine import ticket +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine') + + class OvirtWebSocketProxy(websockify.WebSocketProxy): """" Websocket proxy for usage with oVirt engine. diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 099574f..794566b 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -22,7 +22,6 @@ import os import sys import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from . import config +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + def osetupattrsclass(o): sys.modules[o.__module__].__dict__.setdefault( '__osetup_attrs__', [] diff --git a/packaging/setup/ovirt_engine_setup/dialog.py b/packaging/setup/ovirt_engine_setup/dialog.py index 9d5b787..3b417eb 100644 --- a/packaging/setup/ovirt_engine_setup/dialog.py +++ b/packaging/setup/ovirt_engine_setup/dialog.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,12 +20,15 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export def queryBoolean( dialog, diff --git a/packaging/setup/ovirt_engine_setup/domains.py b/packaging/setup/ovirt_engine_setup/domains.py index 82af799..29802bc 100644 --- a/packaging/setup/ovirt_engine_setup/domains.py +++ b/packaging/setup/ovirt_engine_setup/domains.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. @@ -19,13 +19,16 @@ import re import tempfile import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import base from otopi import util +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class StorageDomainType(object): # See: org.ovirt.engine.core.common.businessentities.StorageDomainType diff --git a/packaging/setup/ovirt_engine_setup/engine/constants.py b/packaging/setup/ovirt_engine_setup/engine/constants.py index 7ac13a3..3f5842e 100644 --- a/packaging/setup/ovirt_engine_setup/engine/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine/constants.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -37,6 +36,10 @@ from . import config +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class FileLocations(object): SYSCONFDIR = '/etc' diff --git a/packaging/setup/ovirt_engine_setup/engine/vdcoption.py b/packaging/setup/ovirt_engine_setup/engine/vdcoption.py index 0e99b87..258d2ba 100644 --- a/packaging/setup/ovirt_engine_setup/engine/vdcoption.py +++ b/packaging/setup/ovirt_engine_setup/engine/vdcoption.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. @@ -18,7 +18,6 @@ import base64 import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from M2Crypto import X509 @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class VdcOption(): diff --git a/packaging/setup/ovirt_engine_setup/engine_common/constants.py b/packaging/setup/ovirt_engine_setup/engine_common/constants.py index 9596af9..ba0b3d2 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/constants.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/constants.py @@ -22,7 +22,6 @@ import os import platform import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -35,6 +34,10 @@ from ovirt_engine_setup.constants import osetupattrs +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class FileLocations(object): SYSCONFDIR = '/etc' diff --git a/packaging/setup/ovirt_engine_setup/engine_common/database.py b/packaging/setup/ovirt_engine_setup/engine_common/database.py index a6e54a6..b234086 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/database.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/database.py @@ -23,7 +23,6 @@ import socket import re import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') import psycopg2 @@ -38,8 +37,11 @@ from ovirt_engine_setup import dialog from ovirt_engine_setup import util as osetuputil -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/ovirt_engine_setup/engine_common/dwh_history_timekeeping.py b/packaging/setup/ovirt_engine_setup/engine_common/dwh_history_timekeeping.py index c247645..8829c33 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/dwh_history_timekeeping.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/dwh_history_timekeeping.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,12 +17,15 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + DB_KEY_RUNNING = 'DwhCurrentlyRunning' DB_KEY_HOSTNAME = 'dwhHostname' DB_KEY_UUID = 'dwhUuid' diff --git a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py index 405e310..2b1c66a 100644 --- a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py +++ b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py @@ -23,7 +23,6 @@ import re import time import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import base @@ -34,12 +33,15 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import util as osetuputil +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class AlternateUser(object): def __init__(self, user): diff --git a/packaging/setup/ovirt_engine_setup/hostname.py b/packaging/setup/ovirt_engine_setup/hostname.py index 0f277e4..95ab5ca 100644 --- a/packaging/setup/ovirt_engine_setup/hostname.py +++ b/packaging/setup/ovirt_engine_setup/hostname.py @@ -19,7 +19,6 @@ import re import socket import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,6 +28,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Hostname(base.Base): _IPADDR_RE = re.compile(r'\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}') diff --git a/packaging/setup/ovirt_engine_setup/remote_engine.py b/packaging/setup/ovirt_engine_setup/remote_engine.py index 18e3f46..0d6365d 100644 --- a/packaging/setup/ovirt_engine_setup/remote_engine.py +++ b/packaging/setup/ovirt_engine_setup/remote_engine.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. @@ -20,7 +20,6 @@ import tempfile import time import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from M2Crypto import X509 @@ -37,6 +36,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class RemoteEngine(base.Base): diff --git a/packaging/setup/ovirt_engine_setup/util.py b/packaging/setup/ovirt_engine_setup/util.py index 1d6e983..58971de 100644 --- a/packaging/setup/ovirt_engine_setup/util.py +++ b/packaging/setup/ovirt_engine_setup/util.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. @@ -23,12 +23,15 @@ import pwd import grp import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export def editConfigContent( content, diff --git a/packaging/setup/ovirt_engine_setup/websocket_proxy/constants.py b/packaging/setup/ovirt_engine_setup/websocket_proxy/constants.py index df0da98..fc82a22 100644 --- a/packaging/setup/ovirt_engine_setup/websocket_proxy/constants.py +++ b/packaging/setup/ovirt_engine_setup/websocket_proxy/constants.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. @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -34,6 +33,10 @@ from . import config as wspconfig +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Const(object): WEBSOCKET_PROXY_SERVICE_NAME = 'ovirt-websocket-proxy' diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py b/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py index d21af0e..de21469 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/answerfile.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 os import datetime import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Answer file plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py index 221ab1d..57f5085 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/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. @@ -22,7 +22,6 @@ import os import logging import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -34,6 +33,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py index effdfdc..c2e34b4 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.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 platform import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -33,6 +32,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase, packager.PackagerBase): """Offline packager.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.py b/packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.py index adb4276..d895526 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/postinstall.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-setup') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """post install config file plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/reconfigure.py b/packaging/setup/plugins/ovirt-engine-common/base/core/reconfigure.py index 5da7e88..3eafe5a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/reconfigure.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/reconfigure.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Reconfigure env plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.py b/packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.py index e5d03bd..05848c9 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/core/uninstall.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. @@ -24,7 +24,6 @@ import configparser import hashlib import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -35,6 +34,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + class RegisterGroups(object): def __init__(self, environment): diff --git a/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py index 84a3eaf..5efe0d5 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.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-setup') from otopi import util @@ -30,6 +29,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Titles plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.py b/packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.py index 9b3422c..f5ed435 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/distro-rpm/log_setup_event.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 platform import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.py b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.py index aadf8f0..14fc17a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.py b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.py index d8e4c66..39d1f49 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_firewalld.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 os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -37,6 +36,10 @@ from . import process_firewalld_services +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.py b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.py index d48ced7..3ec4190 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_human.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-setup') from otopi import util @@ -35,6 +34,10 @@ from . import process_firewalld_services +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py index 9a53997..8edd2ae 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/firewall_manager_iptables.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. @@ -23,7 +23,6 @@ import difflib import gettext import os -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -43,6 +42,10 @@ from . import process_firewalld_services +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/network/hostname.py b/packaging/setup/plugins/ovirt-engine-common/base/network/hostname.py index d6c6e21..d306311 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/network/hostname.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/network/hostname.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup import hostname as osetuphostname +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Protocols plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py index b2eddb3..63ee050 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_manual_files.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. @@ -19,7 +19,6 @@ import os import tempfile import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,6 +29,10 @@ from ovirt_engine_setup import remote_engine_base +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py index 9a61ead..392a86c 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/remote_engine/remote_engine_root_ssh.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. @@ -19,7 +19,6 @@ import socket import time import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,6 +29,10 @@ from ovirt_engine_setup import remote_engine_base +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.py b/packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.py index 7a1075f..fe3492a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/system/hostile_services.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. @@ -22,7 +22,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-common/base/system/mem.py b/packaging/setup/plugins/ovirt-engine-common/base/system/mem.py index 599c5b2..fe1233b 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/system/mem.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/system/mem.py @@ -18,7 +18,6 @@ import re import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -27,6 +26,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py index b6c7f79..70c5b13 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/misc.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-setup') from otopi import util @@ -25,8 +24,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py index b4d2931..36c3894 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/core/protocols.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-setup') from otopi import util @@ -28,8 +27,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/provisioning/postgres.py index 5ac69ad..638a3fa 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/provisioning/postgres.py @@ -20,15 +20,17 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util from otopi import plugin -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py index 099c000..6d731e8 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/apache.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py index ed54c6d..985d999 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/system/environment.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 os import pwd import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,8 +29,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py index 3410186..1bf1c99 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/engine.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-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Engine plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/fence_kdump_listener.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/fence_kdump_listener.py index 829457a..3604733 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/fence_kdump_listener.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/fence_kdump_listener.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """fence_kdump listener plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py index b02b50b..f61086f 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/core/misc.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-setup') from otopi import util @@ -28,6 +27,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/config.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/config.py index 6146309..43e318d 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/config.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/config.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Config plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py index 8949ba8..ef0efd9 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/connection.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-setup') from otopi import util @@ -33,11 +32,14 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py index 8ef5429..b22514a 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine/db/pgpass.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,19 +20,21 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util from otopi import plugin -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """DB pgpass plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py index e6df201..f1a5b18 100644 --- a/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py +++ b/packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.websocket_proxy import constants as owspcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """websocket proxy plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py index 15138a1..75d1a65 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/base/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. @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -34,6 +33,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Engine plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py b/packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py index d91aed0..dda1ecc 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py +++ b/packaging/setup/plugins/ovirt-engine-remove/base/files/simple.py @@ -24,7 +24,6 @@ import hashlib import configparser import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -37,6 +36,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Simple plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.py b/packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.py index 2dae58e..9a18286 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.py +++ b/packaging/setup/plugins/ovirt-engine-remove/base/network/firewall_manager.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-setup') from otopi import constants as otopicons @@ -32,6 +31,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-common/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-common/system/sysctl.py index 7f660ae..00f7602 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-common/system/sysctl.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine-common/system/sysctl.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. @@ -21,7 +21,6 @@ import gettext import os -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """sysctl plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py index de28d2a..a104542 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/ca.py @@ -24,7 +24,6 @@ import datetime import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -33,11 +32,14 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import util as osetuputil +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """CA plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/misc.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/misc.py index faea8a4..df4bb6d 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/config/misc.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Engine-remove plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py index 24dd17f..d50c214 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/db/clear.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,12 +28,15 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Clear plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py index b0b55c8..8f8067c 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/engine.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. @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Engine plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/fence_kdump_listener.py b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/fence_kdump_listener.py index e19eac5..5d7fcd7 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/fence_kdump_listener.py +++ b/packaging/setup/plugins/ovirt-engine-remove/ovirt-engine/system/fence_kdump_listener.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """fence_kdump listener plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py index df22862..580f3c8 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/websocket_proxy/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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Websocket-proxy plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py index 8552f1d..ca4bd18 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/database.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-setup') from otopi import constants as otopicons @@ -30,13 +29,16 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common import database from ovirt_engine_setup import domains +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """database plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py index 92d964c..5da7a29 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/engine.py @@ -1,7 +1,7 @@ # # 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-setup') from otopi import util @@ -30,8 +29,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py index 57e21ba..9910ccb 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/misc.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -32,6 +31,10 @@ from ovirt_engine_setup import hostname as osetuphostname +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py index 030fb3e..79cdf92 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/pki.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. @@ -21,11 +21,9 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from M2Crypto import X509 -XN_FLAG_SEP_MULTILINE = 4 << 16 from otopi import constants as otopicons @@ -44,6 +42,13 @@ from ovirt_engine_setup import dialog +XN_FLAG_SEP_MULTILINE = 4 << 16 + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """CA plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py index 8aadfe2..1e90b1f 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/protocols.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. @@ -26,7 +26,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -39,6 +38,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Protocols plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py index 15a50b5..4b1f6ec 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/tools.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 os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -32,8 +31,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py index f504ecc..70fe018 100644 --- a/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.py +++ b/packaging/setup/plugins/ovirt-engine-rename/ovirt-engine/uninstall.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. @@ -24,7 +24,6 @@ import hashlib import configparser import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -36,6 +35,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Simple plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py index 615837e..33460dd 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/base/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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -31,6 +30,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/base/dialog/preview.py b/packaging/setup/plugins/ovirt-engine-setup/base/dialog/preview.py index c21ca87..f941c9d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/base/dialog/preview.py +++ b/packaging/setup/plugins/ovirt-engine-setup/base/dialog/preview.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Preview plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py b/packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py index 3b4fe8a..0be4d5a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.py +++ b/packaging/setup/plugins/ovirt-engine-setup/base/network/firewall_manager.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-setup') from otopi import constants as otopicons @@ -33,6 +32,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/base/system/environment.py b/packaging/setup/plugins/ovirt-engine-setup/base/system/environment.py index 9c75d56..e69a77a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/base/system/environment.py +++ b/packaging/setup/plugins/ovirt-engine-setup/base/system/environment.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. @@ -23,7 +23,6 @@ import os import pwd import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup import constants as osetupcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Environment plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py index 9d70dd3..aab0698 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/core.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,6 +29,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache enable plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py index 4f8723b..400c3bd 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,6 +29,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py index 7ecad0e..b1d9d78 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/selinux.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache selinux plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py index 8317f9b..af7e468 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/apache/ssl.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. @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -36,6 +35,10 @@ from ovirt_engine_setup import util as osetuputil +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache ssl plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/firewall.py index 024c920..bc3ca5f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/firewall.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. @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,8 +28,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py index b04ad97..c5f7b31 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/java.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-setup') from otopi import util @@ -30,8 +29,11 @@ from ovirt_engine import java -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py index 6580148..05c896f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/config/jboss.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. @@ -21,15 +21,17 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util from otopi import plugin -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py index 2e821b2..0dbb4df 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.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. @@ -21,7 +21,6 @@ import platform import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,8 +28,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py index 0d84d7a..638234d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/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. @@ -24,7 +24,6 @@ import platform import datetime import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -37,6 +36,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/system/sysctl.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/system/sysctl.py index 484eb98..4e5a76f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/system/sysctl.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/system/sysctl.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-setup') from otopi import constants as otopicons @@ -30,11 +29,14 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """sysctl plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py index c67505e..3e6f511 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/core.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 gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,11 +31,14 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py index f0173f0..4becc95 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/cpu.py @@ -21,7 +21,6 @@ """ import sys import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py index 64c516d..4c6092d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/firewall.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-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py index d8cafab..57a34e5 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/sshd.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. @@ -24,7 +24,6 @@ import os import re import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -35,8 +34,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py index 621fec3..c1d5636 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/storage.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. @@ -23,7 +23,6 @@ import os import datetime import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -34,11 +33,14 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import domains as osetupdomains +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsmi.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsmi.py index 6985479..2202cf7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsmi.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/all-in-one/vdsmi.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. @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') import sys import time import distutils.version @@ -38,6 +37,10 @@ from ovirt_engine_setup.engine import vdcoption +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py index da8bbc7..15b8bcb 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.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-setup') from otopi import constants as otopicons @@ -34,8 +33,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py index 9b1b822..46815c8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/root.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-setup') from otopi import constants as otopicons @@ -34,6 +33,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Apache root plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py index 393e226..5f740bc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/appmode.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-setup') from otopi import util @@ -30,8 +29,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine import vdcoption -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py index b8879f9..baa2fb8 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/ca.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-setup') from otopi import util @@ -34,8 +33,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py index 837de63..94defb7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/database.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-setup') from otopi import constants as otopicons @@ -36,6 +35,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Databsae plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py index 8c34c03..32c8128 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/domain_type.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-setup') from otopi import util @@ -31,6 +30,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py index 7ba84da..14f72c7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/firewall.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. @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,8 +28,11 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py index 864f2b0..f5277bc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.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. @@ -26,7 +26,6 @@ import os import re import uuid -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -37,12 +36,15 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import domains as osetupdomains from ovirt_engine_setup import util as osetuputil +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py index 182c15f..c041b6e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/java.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -36,6 +35,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Misc plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py index 681dce2..2587f0e 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/jboss.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-setup') from otopi import constants as otopicons @@ -31,8 +30,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py index 0918902..25ce612 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/macrange.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 random import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -30,8 +29,11 @@ from ovirt_engine_setup.engine import vdcoption from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py index b78e64f..050f503 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/options.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-setup') from otopi import constants as otopicons @@ -30,12 +29,15 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup.engine import vdcoption +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """options plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py index 4cfaa4e..44a3e53 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/protocols.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-setup') from otopi import constants as otopicons @@ -31,8 +30,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py index e241049..34353b5 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/public_glance_repository.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,8 +28,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/storage.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/storage.py index 8f78f79..97f9ae9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/storage.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/storage.py @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -29,11 +28,15 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup import dialog from ovirt_engine_setup.engine import vdcoption + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + SAN_WIPE_AFTER_DELETE = osetupcons.ConfigEnv.SAN_WIPE_AFTER_DELETE diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py index fd09170..145845d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/tools.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 os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -32,8 +31,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py index be5791f..996f97d 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/core/misc.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -34,6 +33,10 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export @@ -84,8 +87,8 @@ default=True, ) if self.environment[oenginecons.EngineDBEnv.NEW_DATABASE] else ( - self._engine_fqdn is not None - and self.environment[ + self._engine_fqdn is not None and + self.environment[ osetupcons.ConfigEnv.FQDN ] == self._engine_fqdn ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py index 297d65c..2723061a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/connection.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/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-setup') from otopi import constants as otopicons @@ -30,11 +29,14 @@ from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Connection plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py index 1990e59..5dcbd6b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/db/schema.py @@ -21,7 +21,6 @@ import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -32,11 +31,14 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine_common import database +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Schema plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py index 4afbc1f..bdbdb03 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py index c98f739..befa256 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/fence_kdump_listener/config.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. @@ -20,7 +20,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import plugin @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """fence_kdump listener plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py index 6271a53..d9b9636 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ca.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. @@ -23,7 +23,6 @@ import re import random import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from M2Crypto import X509 @@ -46,6 +45,10 @@ from ovirt_engine_setup import util as osetuputil +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """CA plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py index aa024e1..4cb21f7 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/pki/ssh.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. @@ -23,7 +23,6 @@ import base64 import struct import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from M2Crypto import X509 @@ -38,8 +37,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py index 2be3d22..25cc29b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/provisioning/postgres.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/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-setup') from otopi import util @@ -28,13 +27,16 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons from ovirt_engine_setup.engine import constants as oenginecons from ovirt_engine_setup import dialog from ovirt_engine_setup.engine_common import postgres +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Local Postgres plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py index 989c292..58e18e0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/engine.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-setup') from otopi import util @@ -29,8 +28,11 @@ from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py index a3626fe..b879290 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/exportfs.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. @@ -23,7 +23,6 @@ import re import os import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -35,6 +34,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/image_upload.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/image_upload.py index 73ef7d5..f18d8a1 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/image_upload.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/image_upload.py @@ -1,7 +1,7 @@ # # image_upload plugin -- 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. @@ -26,7 +26,6 @@ import os import shutil import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -39,6 +38,10 @@ from ovirt_engine_setup.engine_common import constants as oengcommcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py index e177a77..47560f6 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/memcheck.py @@ -22,7 +22,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py index 0e93a04..2cbb46c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.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. @@ -24,7 +24,6 @@ import os import platform import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -39,6 +38,10 @@ from ovirt_engine_setup import dialog +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.py index 3f00cfc..bf77c13 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/selinux.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-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.py index 7ae0d22..0cc8fc0 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/answerfile_fixup.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 os import glob import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -33,6 +32,10 @@ from ovirt_engine_setup.engine import constants as oenginecons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """Temporary fixup for invalid permission of past answer files.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py index a0e6ccd..e3859f9 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/asynctasks.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. @@ -22,7 +22,6 @@ import time import gettext import distutils.version -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -42,6 +41,10 @@ from async_tasks_map import ASYNC_TASKS_MAP +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ DB Async tasks handling plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py index 6308c0e..b69424b 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dbvalidations.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-setup') from otopi import constants as otopicons @@ -30,8 +29,11 @@ from ovirt_engine_setup import dialog from ovirt_engine_setup.engine import constants as oenginecons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons +from ovirt_engine_setup.engine_common import constants as oengcommcons + + +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') @util.export diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py index 8594494..b418e4f 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/upgrade/dwh.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 time import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -36,6 +35,10 @@ from ovirt_engine_setup.engine import vdcoption +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """dwh plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py index bdc7f96..0163e40 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.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. @@ -23,7 +23,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -39,6 +38,10 @@ from ovirt_engine_setup import hostname as osetuphostname +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """websocket proxy plugin.""" diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/packages.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/packages.py index 1d45f25..0532e7a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/packages.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. @@ -21,7 +21,6 @@ """ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import util @@ -32,6 +31,10 @@ from ovirt_engine_setup.websocket_proxy import constants as owspcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """ diff --git a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py index d7bae33..678ae9c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.py +++ b/packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/pki.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. @@ -26,7 +26,6 @@ import gettext -_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-setup') from otopi import constants as otopicons @@ -41,6 +40,10 @@ from ovirt_engine_setup.websocket_proxy import constants as owspcons +def _(m): + return gettext.dgettext(message=m, domain='ovirt-engine-setup') + + @util.export class Plugin(plugin.PluginBase): """websocket proxy plugin.""" -- To view, visit https://gerrit.ovirt.org/38487 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b6ee66fb522e542e567c4024cbd8c6ad169d378 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
