CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL4
Changes by: [EMAIL PROTECTED] 2008-04-21 18:19:45
Modified files:
luci/site/luci/Extensions: homebase_adapters.py
Log message:
Missed in last commit
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/homebase_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL4&r1=1.48.2.4&r2=1.48.2.5
--- conga/luci/site/luci/Extensions/homebase_adapters.py 2008/03/25
01:27:12 1.48.2.4
+++ conga/luci/site/luci/Extensions/homebase_adapters.py 2008/04/21
18:19:45 1.48.2.5
@@ -629,29 +629,29 @@
luci_log.debug_verbose('VAC5: %s' %
err_msg)
continue
- cur_os = resolveOSType(rc.os())
- if cur_os != cluster_os:
- if LUCI_DEBUG_MODE is True:
- luci_log.debug_verbose('VAC5a: "%s" /
"%s" -> "%s"' \
- % (cluster_os, rc.os(), cur_os))
- incomplete = True
- cur_system['errors'] = True
-
- if not prev_auth:
- try:
- rc.unauth()
- except Exception, e:
- if LUCI_DEBUG_MODE is True:
-
luci_log.debug_verbose('VAC6: %s: %r %s' \
- % (cur_host, e,
str(e)))
-
- err_msg = 'Node %s reports its cluster version
is %s and we expect %s' \
- % (cur_host, cur_os, cluster_os)
-
- errors.append(err_msg)
- if LUCI_DEBUG_MODE is True:
- luci_log.debug_verbose('VAC7: %s' %
err_msg)
- continue
+ #cur_os = resolveOSType(rc.os())
+ #if cur_os != cluster_os:
+ # if LUCI_DEBUG_MODE is True:
+ # luci_log.debug_verbose('VAC5a: "%s" /
"%s" -> "%s"' \
+ # % (cluster_os, rc.os(), cur_os))
+ # incomplete = True
+ # cur_system['errors'] = True
+
+ # if not prev_auth:
+ # try:
+ # rc.unauth()
+ # except Exception, e:
+ # if LUCI_DEBUG_MODE is True:
+ #
luci_log.debug_verbose('VAC6: %s: %r %s' \
+ # % (cur_host, e,
str(e)))
+
+ # err_msg = 'Node %s reports its cluster version
is %s and we expect %s' \
+ # % (cur_host, cur_os, cluster_os)
+
+ # errors.append(err_msg)
+ # if LUCI_DEBUG_MODE is True:
+ # luci_log.debug_verbose('VAC7: %s' %
err_msg)
+ # continue
else:
incomplete = True
