Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Move JASPER_HOME init to common ......................................................................
packaging: setup: Move JASPER_HOME init to common Without this, engine-cleanup fails. Change-Id: I3354802b902bb99a593a5028a5b3685787b579c8 Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/__init__.py A packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py 3 files changed, 78 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-reports refs/changes/86/27986/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/__init__.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/__init__.py new file mode 100644 index 0000000..bb6b53a --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/__init__.py @@ -0,0 +1,30 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2013-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. +# + + +from otopi import util + + +from . import jasper + + +@util.export +def createPlugins(context): + jasper.Plugin(context=context) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py new file mode 100644 index 0000000..1ed7829 --- /dev/null +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-reports/config/jasper.py @@ -0,0 +1,47 @@ +# +# ovirt-engine-setup -- ovirt engine setup +# Copyright (C) 2013-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. +# + + +import os +import gettext +_ = lambda m: gettext.dgettext(message=m, domain='ovirt-engine-reports') + + +from otopi import util +from otopi import plugin + + +from ovirt_engine_setup import reportsconstants as oreportscons + + +@util.export +class Plugin(plugin.PluginBase): + + def __init__(self, context): + super(Plugin, self).__init__(context=context) + + @plugin.event( + stage=plugin.Stages.STAGE_INIT, + ) + def _init(self): + self.environment.setdefault( + oreportscons.ConfigEnv.JASPER_HOME, + oreportscons.FileLocations.JASPER_HOME + ) + + +# vim: expandtab tabstop=4 shiftwidth=4 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py index 7a43a9f..57afefa 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-reports/config/jasper.py @@ -1,6 +1,6 @@ # # ovirt-engine-setup -- ovirt engine setup -# Copyright (C) 2013 Red Hat, Inc. +# Copyright (C) 2013-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. @@ -34,15 +34,6 @@ def __init__(self, context): super(Plugin, self).__init__(context=context) - - @plugin.event( - stage=plugin.Stages.STAGE_INIT, - ) - def _init(self): - self.environment.setdefault( - oreportscons.ConfigEnv.JASPER_HOME, - oreportscons.FileLocations.JASPER_HOME - ) @plugin.event( stage=plugin.Stages.STAGE_VALIDATION, -- To view, visit http://gerrit.ovirt.org/27986 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3354802b902bb99a593a5028a5b3685787b579c8 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-reports Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
