Simone Tiraboschi has uploaded a new change for review. Change subject: packaging: setup: fixing a dependency problem ......................................................................
packaging: setup: fixing a dependency problem Fixing a dependency problem moving engine-common import away from base pkg. Change-Id: Id1dd12d87951e322a2863a5723db4cef23a12c2e Bug-url: https://bugzilla.redhat.com/1114978 Signed-off-by: Simone Tiraboschi <[email protected]> --- M packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/__init__.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/titles.py 3 files changed, 92 insertions(+), 15 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/56/29456/1 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 98871ab..22f6fae 100644 --- a/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py +++ b/packaging/setup/plugins/ovirt-engine-common/base/dialog/titles.py @@ -28,8 +28,6 @@ from ovirt_engine_setup import constants as osetupcons -from ovirt_engine_setup.engine_common \ - import constants as oengcommcons @util.export @@ -43,19 +41,6 @@ def __init__(self, context): super(Plugin, self).__init__(context=context) - - @plugin.event( - stage=plugin.Stages.STAGE_CUSTOMIZATION, - name=oengcommcons.Stages.DB_OWNERS_CONNECTIONS_CUSTOMIZED, - before=( - oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, - ), - after=( - oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, - ), - ) - def _db_owners_connections_customized(self): - pass @plugin.event( stage=plugin.Stages.STAGE_CLOSEUP, diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/__init__.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/__init__.py new file mode 100644 index 0000000..8bccd05 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/__init__.py @@ -0,0 +1,33 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2014 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""ovirt-setup dialog plugin.""" + + +from otopi import util + + +from . import titles + + [email protected] +def createPlugins(context): + titles.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/titles.py new file mode 100644 index 0000000..7014ca0 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-common/dialog/titles.py @@ -0,0 +1,59 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2014 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. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + + +"""Titles plugin.""" + + +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 + + [email protected] +class Plugin(plugin.PluginBase): + """Titles plugin.""" + + def _title(self, text): + self.dialog.note( + text='\n--== %s ==--\n\n' % text, + ) + + def __init__(self, context): + super(Plugin, self).__init__(context=context) + + @plugin.event( + stage=plugin.Stages.STAGE_CUSTOMIZATION, + name=oengcommcons.Stages.DB_OWNERS_CONNECTIONS_CUSTOMIZED, + before=( + oengcommcons.Stages.DIALOG_TITLES_E_DATABASE, + ), + after=( + oengcommcons.Stages.DIALOG_TITLES_S_DATABASE, + ), + ) + def _db_owners_connections_customized(self): + pass + + +# vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/29456 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id1dd12d87951e322a2863a5723db4cef23a12c2e 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
