summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorKrzysztof A. Adamski <krzysztofa@gmail.com>2008-05-31 07:50:00 -0400
committerKrzysztof A. Adamski <krzysztofa@gmail.com>2008-05-31 07:50:00 -0400
commit8e96ee4101213ccaba11c95729bf88171873d03c (patch)
tree65b60e263d2fe30b70e0a3028c2fe18a8eaef901 /func
parentcbb7650e359f8870cd59501bc0e9904d5a9e6ea6 (diff)
downloadthird_party-func-8e96ee4101213ccaba11c95729bf88171873d03c.tar.gz
third_party-func-8e96ee4101213ccaba11c95729bf88171873d03c.tar.xz
third_party-func-8e96ee4101213ccaba11c95729bf88171873d03c.zip
Return unformated results from do().
Diffstat (limited to 'func')
-rw-r--r--func/overlord/cmd_modules/call.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index fcae0b3..edf9f38 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -133,13 +133,13 @@ class Call(base_command.BaseCommand):
(return_code, async_results) = self.overlord_obj.job_status(float(self.module))
res = self.format_return((return_code, async_results))
print res
- return 0
+ return async_results
if self.options.async:
partial = {}
if self.options.nopoll:
print "JOB_ID:", pprint.pformat(results)
- return 0
+ return results
else:
async_done = False
while not async_done:
@@ -149,7 +149,7 @@ class Call(base_command.BaseCommand):
elif return_code == jobthing.JOB_ID_ASYNC_FINISHED:
async_done = True
partial = self.print_partial_results(partial, async_results, self.options.sort)
- return 0
+ return partial
elif return_code == jobthing.JOB_ID_ASYNC_PARTIAL:
if not self.options.sort:
partial = self.print_partial_results(partial, async_results)
@@ -165,7 +165,7 @@ class Call(base_command.BaseCommand):
print foo
# nothing really makes use of this atm -akl
- return foo
+ return results
def print_partial_results(self, old, new, sort=0):
diff = dict([(k, v) for k, v in new.iteritems() if k not in old])