func/minion/modules/hardware.py | 2 +-
func/minion/server.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit dd35d711f284084bffe1d84fba5e65267f2d6071
Author: S.Ã?aÄ?lar Onur <caglar@xxxxxxxxxxxxxxxx>
Date: Mon Jun 14 14:49:42 2010 -0400
Fix exceptions.NameError global name 'module_module' is not defined
Error on host XXX: REMOTE_ERROR exceptions.NameError global name 'module_mo
rc = self.__method(*args)
File "/usr/lib/python2.6/site-packages/func/minion/server.py", line 148,
inventory[module_module].append(method_name)
and
NameError: global name 'hw_info' is not defined
diff --git a/func/minion/modules/hardware.py b/func/minion/modules/hardware.py
index ce72c2b..0937d56 100644
--- a/func/minion/modules/hardware.py
+++ b/func/minion/modules/hardware.py
@@ -60,7 +60,7 @@ class HardwareModule(func_module.FuncModule):
return results
def inventory(self):
- data = hw_info(with_devices=True)
+ data = self.info()
# remove bogomips because it keeps changing for laptops
# and makes inventory tracking noisy
if data.has_key("bogomips"):
diff --git a/func/minion/server.py b/func/minion/server.py
index 9a81168..5f217d7 100644
--- a/func/minion/server.py
+++ b/func/minion/server.py
@@ -145,7 +145,7 @@ class XmlRpcInterface(object):
method_module = string.join(method_bits[:-1], '.')
method_name = method_bits[-1]
if method_module in inventory:
- inventory[module_module].append(method_name)
+ inventory[method_module].append(method_name)
return inventory
_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list
