From mboxrd@z Thu Jan  1 00:00:00 1970
From: rmccabe@sourceware.org <rmccabe@sourceware.org>
Date: 26 Jul 2007 05:57:42 -0000
Subject: [Cluster-devel] conga/luci/site/luci/Extensions/ClusterModel M ...
Message-ID: <20070726055742.11282.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
Branch: 	RHEL5
Changes by:	rmccabe at sourceware.org	2007-07-26 05:57:42

Modified files:
	luci/site/luci/Extensions/ClusterModel: ModelBuilder.py 

Log message:
	Part of fixes for 249086 missed in the previous commit

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.4.2&r2=1.1.4.3

--- conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py	2007/06/25 19:10:55	1.1.4.2
+++ conga/luci/site/luci/Extensions/ClusterModel/ModelBuilder.py	2007/07/26 05:57:42	1.1.4.3
@@ -48,7 +48,6 @@
 from FailoverDomains import FailoverDomains
 from FailoverDomainNode import FailoverDomainNode
 from Rm import Rm
-from GeneralError import GeneralError
 
 DLM_TYPE	= 0
 GULM_TYPE	= 1
@@ -563,7 +562,7 @@
       if svc.getName() == name:
         return svc
 
-    raise GeneralError('FATAL', "Couldn't find service name in current list")
+    raise KeyError, 'Couldn\'t find service name %s in current list' % name
 
   def retrieveVMsByName(self, name):
     vms = self.getVMs()
@@ -571,7 +570,7 @@
       if v.getName() == name:
         return v
 
-    raise GeneralError('FATAL', "Couldn't find VM name %s in current list" % name)
+    raise KeyError, 'Couldn\'t find VM name %s in current list' % name
 
   def del_totem(self):
     if self.TOTEM_ptr is not None: