[Cluster-devel] conga/luci/site/luci/Extensions homebase_adapt ...

[rmccabe at sourceware.org]

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-01-08 19:49:20

Modified files:
	luci/site/luci/Extensions: homebase_adapters.py ricci_bridge.py 

Log message:
	fix two small bugs related to bz201394

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/homebase_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.34.2.9&r2=1.34.2.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.30.2.16&r2=1.30.2.17

--- conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/04 00:22:13	1.34.2.9
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/08 19:49:20	1.34.2.10
@@ -549,7 +549,7 @@
 					% (cur_host, str(e)))
 				incomplete = True
 				cur_system['errors'] = True
-				luci_log.debug_verbose('VAC3: %s: %s' % cur_host, str(e))
+				luci_log.debug_verbose('VAC3: %s: %s' % (cur_host, str(e)))
 				continue
 
 			cluster_info = rc.cluster_info()
--- conga/luci/site/luci/Extensions/ricci_bridge.py	2007/01/04 00:22:13	1.30.2.16
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/01/08 19:49:20	1.30.2.17
@@ -271,6 +271,7 @@
 			raise Exception, 'no batch tag was found'
 	except Exception, e:
 		luci_log.debug_verbose('batchAttemptResult: %s' % str(e))
+		return (None, None)
 
 	for i in batch:
 		try: