From mboxrd@z Thu Jan  1 00:00:00 1970
From: jparsons@sourceware.org <jparsons@sourceware.org>
Date: 12 Oct 2006 17:08:26 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions cluster_adapte ...
Message-ID: <20061012170826.27403.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:	jparsons at sourceware.org	2006-10-12 17:08:25

Modified files:
	luci/site/luci/Extensions: cluster_adapters.py 

Log message:
	Trap connect failure

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.101&r2=1.102

--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/12 15:50:56	1.101
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/12 17:08:25	1.102
@@ -2358,8 +2358,15 @@
     map['os'] = ""
     map['isVirtualized'] = False
     return map
+  
+  try:
+    rc = RicciCommunicator(ricci_agent)
+  except:
+    map = {}
+    map['os'] = ""
+    map['isVirtualized'] = False
+    return map
 
-  rc = RicciCommunicator(ricci_agent)
   map = {}
   os_str = resolveOSType(rc.os())
   map['os'] = os_str