CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: [email protected] 2011-03-25 20:14:42
Modified files:
luci/utils : luci_admin
Log message:
Fix bz643996 - luci_admin doesn't operate correctly if external zope3
packages are installed
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.50.2.8&r2=1.50.2.9
--- conga/luci/utils/luci_admin 2010/01/07 18:08:36 1.50.2.8
+++ conga/luci/utils/luci_admin 2011/03/25 20:14:39 1.50.2.9
@@ -15,7 +15,7 @@
import xml
import xml.dom
-sys.path.extend((
+for i in (
'/usr/lib/luci/zope/lib/python',
'/usr/lib/luci/zope/lib/python/Products',
'/usr/lib64/luci/zope/lib/python',
@@ -28,7 +28,8 @@
'/usr/lib64/zope/lib/python/Products',
'/usr/lib64/zope/lib64/python/Products',
'/usr/lib/zope/lib/python/Products'
-))
+):
+ sys.path.insert(0, i)
from Products import __path__
for pdir in [
@@ -40,7 +41,7 @@
'/usr/lib/zope/lib/python/Products']:
if os.path.isdir(pdir):
- __path__.append(pdir)
+ __path__.insert(0, pdir)
LUCI_ADMIN_DEBUG = False
