summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdrian Likins <alikins@redhat.com>2008-11-13 17:16:52 -0500
committerAdrian Likins <alikins@redhat.com>2008-11-13 17:16:52 -0500
commitc0062d79da547c3979e948e12e953b56d15ec667 (patch)
tree9277fddd97ae0349b819bba187468450dada9efe
parent5f975a37d7c6523e0e8bdc4ea54ec87038752c08 (diff)
downloadfunc-c0062d79da547c3979e948e12e953b56d15ec667.tar.gz
func-c0062d79da547c3979e948e12e953b56d15ec667.tar.xz
func-c0062d79da547c3979e948e12e953b56d15ec667.zip
more func.utils/certmaster.utils changes.
Fallout from the certmaster split.
-rw-r--r--func/minion/modules/delegation.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/func/minion/modules/delegation.py b/func/minion/modules/delegation.py
index d7731bc..b8d6c8d 100644
--- a/func/minion/modules/delegation.py
+++ b/func/minion/modules/delegation.py
@@ -13,7 +13,7 @@ import func_module
import func.overlord.client as fc
import func.jobthing as jobthing
-from func import utils
+from certmaster import utils as cm_utils
from func.overlord import delegation_tools as dtools
#boolean value appended to job id list to denote direct/delegated calls
@@ -58,7 +58,7 @@ class DelegationModule(func_module.FuncModule):
else:
#These are delegated calls, so we need to strip away the
#hash that surrounds the results
- if utils.is_error(delegation_results[group]):
+ if cm_utils.is_error(delegation_results[group]):
result_dict.update(delegation_results)
else:
result_dict.update(delegation_results[group])