[Cluster-devel] conga/luci/site/luci/Extensions ricci_bridge.py
rmccabe at sourceware.org
rmccabe at sourceware.org
Sun Dec 10 19:19:32 UTC 2006
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-12-10 19:19:32
Modified files:
luci/site/luci/Extensions: ricci_bridge.py
Log message:
change a '0' to 0 to avoid a spurious error message
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.48&r2=1.49
--- conga/luci/site/luci/Extensions/ricci_bridge.py 2006/12/08 23:02:49 1.48
+++ conga/luci/site/luci/Extensions/ricci_bridge.py 2006/12/10 19:19:32 1.49
@@ -16,7 +16,8 @@
batch = rc.batch_report(batch_id)
if batch is None:
return (True, 'batch id was not found')
- except:
+ except Exception, e:
+ luci_log.debug_verbose('checkBatch0: %s: %s' % (rc.hostname(), str(e)))
return (-1, err_msg)
try:
@@ -24,7 +25,8 @@
if new_err_msg:
err_msg = 'A Ricci error occurred on %s: %s' \
% (rc.hostname(), str(new_err_msg))
- except:
+ except Exception, e:
+ luci_log.debug_verbose('checkBatch1: %s: %s' % (rc.hostname(), str(e)))
return (-1, err_msg)
# In progress.
@@ -32,10 +34,12 @@
return (False, 'in progress')
# Done successfully.
- if code == '0':
+ if code == 0:
return (True, 'completed sucessfully')
# Error
+ luci_log.debug_verbose('checkBatch2: %s: %s: %s' \
+ % (str(code), rc.hostname(), str(e)))
return (-1, err_msg)
def addClusterNodeBatch(os_str,
More information about the Cluster-devel
mailing list