Alon Bar-Lev has uploaded a new change for review.

Change subject: packaging: setup: workaround python-2.6 bug
......................................................................

packaging: setup: workaround python-2.6 bug

for some reason when python-2.6 loads a module it consider only short
name of module and ignores the location from which module was loaded,
so it reuses module when trying to load same module short name from
other package.

this cause the following statement in ovirt_engine.py to reuse self
instead of loading correct module:

 from ovirt_engine import util as outil

work around is to rename current module name:

 apache/ovirt_engine.py -> apache/engine.py

Change-Id: I19607ba117d59e310310694648e116d684f9eb2d
Signed-off-by: Alon Bar-Lev <alo...@redhat.com>
---
M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
R packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/09/23009/1

diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py 
b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
index 3daef58..147624b 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/__init__.py
@@ -25,14 +25,14 @@
 from . import root
 from . import ssl
 from . import selinux
-from . import ovirt_engine
+from . import engine
 
 
 @util.export
 def createPlugins(context):
     root.Plugin(context=context)
     ssl.Plugin(context=context)
-    ovirt_engine.Plugin(context=context)
+    engine.Plugin(context=context)
     selinux.Plugin(context=context)
 
 
diff --git 
a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py
 b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py
similarity index 100%
rename from 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/ovirt_engine.py
rename to 
packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/engine.py


-- 
To view, visit http://gerrit.ovirt.org/23009
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I19607ba117d59e310310694648e116d684f9eb2d
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alon Bar-Lev <alo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to