From 59e46428d57966c46c03e5c889ea8fb525fde1a8 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Sat, 13 Sep 2008 00:31:12 +0200 Subject: [PATCH] fix conflict between oldxml and the xml package used or defined in bzrlib bzr revid: chs@tinyerp.com-20080912223112-87la9tkdhtvn5w97 --- bin/openerp-server.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/bin/openerp-server.py b/bin/openerp-server.py index 55e2e858e9d..530f1c29535 100755 --- a/bin/openerp-server.py +++ b/bin/openerp-server.py @@ -37,9 +37,6 @@ GNU Public Licence. (c) 2003-TODAY, Fabien Pinckaers - Tiny sprl """ -import release -__author__ = release.author -__version__ = release.version #---------------------------------------------------------- # python imports @@ -54,6 +51,11 @@ _oldxml = '/usr/lib/python%s/site-packages/oldxml' % sys.version[:3] if os.path.exists(_oldxml): sys.path.append(_oldxml) + +import release +__author__ = release.author +__version__ = release.version + #---------------------------------------------------------- # get logger #----------------------------------------------------------