From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 8 Jan 2007 19:46:51 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions homebase_adapt ...
Message-ID: <20070108194651.18774.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	2007-01-08 19:46:50

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&r1=1.44&r2=1.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.53&r2=1.54

--- conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/04 00:19:49	1.44
+++ conga/luci/site/luci/Extensions/homebase_adapters.py	2007/01/08 19:46:50	1.45
@@ -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:19:49	1.53
+++ conga/luci/site/luci/Extensions/ricci_bridge.py	2007/01/08 19:46:50	1.54
@@ -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: