Sophie

Sophie

distrib > Scientific%20Linux > 5x > x86_64 > by-pkgid > d536e3b2143fe88c174c968d683c0f4f > files > 16

conga-0.12.2-24.el5_6.1.src.rpm

diff -u -r1.1.4.8 ResourceHandler.py
--- conga-0.12.2/luci/site/luci/Extensions/ResourceHandler.py	21 May 2009 13:32:04 -0000	1.1.4.8
+++ conga-0.12.2/luci/site/luci/Extensions/ResourceHandler.py	22 Dec 2009 05:05:55 -0000
@@ -675,10 +675,7 @@
 			raise KeyError, 'No volume group name was given for "%s"' % rname
 		res.addAttribute('vg_name', vg_name)
 	except Exception, e:
-		err = str(e)
-		errors.append(err)
-		if LUCI_DEBUG_MODE is True:
-			luci_log.debug_verbose('addLVM5: %s' % err)
+		vg_name = None
 
 	try:
 		lv_name = form['lv_name'].strip()
@@ -686,10 +683,12 @@
 			raise KeyError, 'No logical volume name was given for "%s"' % rname
 		res.addAttribute('lv_name', lv_name)
 	except Exception, e:
-		err = str(e)
-		errors.append(err)
+		lv_name = None
+
+	if not lv_name and not vg_name:
+		errors.append('Neither lv_name nor vg_name given for resource "%s"' % rname)
 		if LUCI_DEBUG_MODE is True:
-			luci_log.debug_verbose('addLVM6: %s' % err)
+			luci_log.debug_verbose('addLVM6: no vg_name or lv_name for "%s"' % rname)
 
 	return errors