[Cluster-devel] conga/luci/utils luci_admin luci_cleanup

[kupcevic at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	kupcevic at sourceware.org	2006-08-04 18:43:26

Modified files:
	luci/utils     : luci_admin luci_cleanup 

Log message:
	luci: luci_admin: python search paths update

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_admin.diff?cvsroot=cluster&r1=1.43&r2=1.44
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/utils/luci_cleanup.diff?cvsroot=cluster&r1=1.3&r2=1.4

--- conga/luci/utils/luci_admin	2006/08/04 18:37:57	1.43
+++ conga/luci/utils/luci_admin	2006/08/04 18:43:26	1.44
@@ -12,6 +12,8 @@
 	'/usr/lib/luci/zope/lib/python/Products',
 	'/usr/lib64/luci/zope/lib/python',
 	'/usr/lib64/luci/zope/lib/python/Products',
+	'/usr/lib64/luci/zope/lib64/python',
+	'/usr/lib64/luci/zope/lib64/python/Products',
 	'/usr/lib64/zope/lib64/python',
 	'/usr/lib64/zope/lib/python',
 	'/usr/lib/zope/lib/python',
@@ -21,11 +23,12 @@
 ))
 
 from Products import __path__
-for i in [	'/usr/lib/luci/zope/lib/python/Products',
-			'/usr/lib64/luci/zope/lib/python/Products',
-			'/usr/lib64/zope/lib/python/Products',
-			'/usr/lib64/zope/lib64/python/Products',
-			'/usr/lib/zope/lib/python/Products'			]:
+for i in ['/usr/lib/luci/zope/lib/python/Products',
+	  '/usr/lib64/luci/zope/lib/python/Products',
+	  '/usr/lib64/luci/zope/lib64/python/Products',
+	  '/usr/lib64/zope/lib/python/Products',
+	  '/usr/lib64/zope/lib64/python/Products',
+	  '/usr/lib/zope/lib/python/Products']:
 	if os.path.isdir(i):
 		__path__.append(i)
 
@@ -1032,6 +1035,8 @@
 	# If the site hasn't been initialized, there's nothing to
 	# save, and luci_backup() will fail
 	if not luci_initialized():
+		print 'The Luci site has not been initialized\n'
+		print 'Nothing to backup\n'
 		sys.exit(0)
 
 	print 'Backing up the Luci server...'
--- conga/luci/utils/luci_cleanup	2006/08/03 18:41:54	1.3
+++ conga/luci/utils/luci_cleanup	2006/08/04 18:43:26	1.4
@@ -8,6 +8,8 @@
 	'/usr/lib/luci/zope/lib/python/Products',
 	'/usr/lib64/luci/zope/lib/python',
 	'/usr/lib64/luci/zope/lib/python/Products',
+	'/usr/lib64/luci/zope/lib64/python',
+	'/usr/lib64/luci/zope/lib64/python/Products',
 	'/usr/lib64/zope/lib64/python',
 	'/usr/lib64/zope/lib/python',
 	'/usr/lib/zope/lib/python',
@@ -17,11 +19,12 @@
 ))
 
 from Products import __path__
-for i in [	'/usr/lib/luci/zope/lib/python/Products',
-			'/usr/lib64/luci/zope/lib/python/Products',
-			'/usr/lib64/zope/lib/python/Products',
-			'/usr/lib64/zope/lib64/python/Products',
-			'/usr/lib/zope/lib/python/Products'			]:
+for i in ['/usr/lib/luci/zope/lib/python/Products',
+	  '/usr/lib64/luci/zope/lib/python/Products',
+	  '/usr/lib64/luci/zope/lib64/python/Products',
+	  '/usr/lib64/zope/lib/python/Products',
+	  '/usr/lib64/zope/lib64/python/Products',
+          '/usr/lib/zope/lib/python/Products']:
 	if os.path.isdir(i):
 		__path__.append(i)