From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 11 Jul 2006 14:51:46 -0000
Subject: [Cluster-devel] conga/luci load_site.py pack.py
Message-ID: <20060711145146.26911.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2006-07-11 14:51:46

Modified files:
	luci           : load_site.py pack.py 

Log message:
	fix breakage caused by the fc6 zope2.8 -> zope2.9 upgrade

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/load_site.py.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/pack.py.diff?cvsroot=cluster&r1=1.2&r2=1.3

--- conga/luci/load_site.py	2006/06/30 17:45:20	1.7
+++ conga/luci/load_site.py	2006/07/11 14:51:45	1.8
@@ -1,5 +1,5 @@
 #!/usr/bin/python
-# $Id: load_site.py,v 1.7 2006/06/30 17:45:20 rmccabe Exp $
+# $Id: load_site.py,v 1.8 2006/07/11 14:51:45 rmccabe Exp $
 
 ##############################################################################
 #
@@ -33,7 +33,14 @@
 doctor=0
 index_html=0
 
-sys.path.extend(('/usr/lib64/zope/lib/python','/usr/lib/zope/lib/python','/usr/lib64/zope/lib/python/Products','/usr/lib/zope/lib/python/Products'));
+sys.path.extend((
+	'/usr/lib64/zope/lib64/python',
+	'/usr/lib64/zope/lib64/python/Products',
+	'/usr/lib64/zope/lib/python',
+	'/usr/lib64/zope/lib/python/Products',
+	'/usr/lib/zope/lib/python',
+	'/usr/lib/zope/lib/python/Products'
+))
 
 import ZPublisher.Client
 
--- conga/luci/pack.py	2006/04/21 16:25:58	1.2
+++ conga/luci/pack.py	2006/07/11 14:51:45	1.3
@@ -1,9 +1,16 @@
 #!/usr/bin/python
-# $Id: pack.py,v 1.2 2006/04/21 16:25:58 rmccabe Exp $
+# $Id: pack.py,v 1.3 2006/07/11 14:51:45 rmccabe Exp $
 
 import os, sys, string
 
-sys.path.extend(('/usr/lib64/zope/lib/python','/usr/lib/zope/lib/python','/usr/lib64/zope/lib/python/Products','/usr/lib/zope/lib/python/Products'));
+sys.path.extend((
+	'/usr/lib64/zope/lib64/python',
+	'/usr/lib64/zope/lib64/python/Products',
+	'/usr/lib64/zope/lib/python',
+	'/usr/lib64/zope/lib/python/Products',
+	'/usr/lib/zope/lib/python',
+	'/usr/lib/zope/lib/python/Products'
+))
 
 import ZODB