Yedidyah Bar David has uploaded a new change for review.
Change subject: packaging: setup: websocket-proxy: SETUP_ATTRS_MODULES to common
......................................................................
packaging: setup: websocket-proxy: SETUP_ATTRS_MODULES to common
Without this, utilities other than setup (currently rename) drop
wsp constants from postinstall.
Change-Id: I2825c3db19b252464c6fe2dcdad7daa963462399
Signed-off-by: Yedidyah Bar David <d...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-common/websocket_proxy/core.py
M packaging/setup/plugins/ovirt-engine-setup/websocket_proxy/config.py
2 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/78/36378/1
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 fbe2fe2..d3e95f3 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 Red Hat, Inc.
+# 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.
@@ -39,6 +39,14 @@
super(Plugin, self).__init__(context=context)
@plugin.event(
+ stage=plugin.Stages.STAGE_SETUP,
+ )
+ def _setup(self):
+ self.environment[
+ osetupcons.CoreEnv.SETUP_ATTRS_MODULES
+ ].append(owspcons)
+
+ @plugin.event(
stage=plugin.Stages.STAGE_TRANSACTION_BEGIN,
condition=lambda self: not self.environment[
osetupcons.CoreEnv.DEVELOPER_MODE
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 7591b89..8fbcf57 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 Red Hat, Inc.
+# 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.
@@ -72,14 +72,6 @@
owspcons.EngineCoreEnv.ENABLE,
None
)
-
- @plugin.event(
- stage=plugin.Stages.STAGE_SETUP,
- )
- def _setup(self):
- self.environment[
- osetupcons.CoreEnv.SETUP_ATTRS_MODULES
- ].append(owspcons)
@plugin.event(
stage=plugin.Stages.STAGE_LATE_SETUP,
--
To view, visit http://gerrit.ovirt.org/36378
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2825c3db19b252464c6fe2dcdad7daa963462399
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
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
