summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorAdrian Likins <alikins@grimlock.devel.redhat.com>2008-04-08 18:29:31 -0400
committerAdrian Likins <alikins@grimlock.devel.redhat.com>2008-04-08 18:29:31 -0400
commit67503262b3f9226dc139822991b3b0b9b856d7b1 (patch)
tree71336b482c20e7eee30cd64b00919619554932c5 /func
parentb72441aeae3bc786a3f6d25dd2260dbe91a55b41 (diff)
downloadthird_party-func-67503262b3f9226dc139822991b3b0b9b856d7b1.tar.gz
third_party-func-67503262b3f9226dc139822991b3b0b9b856d7b1.tar.xz
third_party-func-67503262b3f9226dc139822991b3b0b9b856d7b1.zip
don't use interactive mode, but print out the results directly from the "call"
commandline module. Probably needs to get revisited at some point, since being able to use the api's the cmdline module expose could be useful, and printing directly like this is a bit odd. The above changes fix --json/--raw/--xmlrpc output for "call"
Diffstat (limited to 'func')
-rw-r--r--func/overlord/cmd_modules/call.py10
1 files changed, 8 insertions, 2 deletions
diff --git a/func/overlord/cmd_modules/call.py b/func/overlord/cmd_modules/call.py
index d3e5fba..b92d3ab 100644
--- a/func/overlord/cmd_modules/call.py
+++ b/func/overlord/cmd_modules/call.py
@@ -65,6 +65,7 @@ class Call(base_command.BaseCommand):
if self.options.json:
try:
import simplejson
+ print "blargh\n\n"
return simplejson.dumps(data)
except ImportError:
print "WARNING: json support not found, install python-simplejson"
@@ -73,6 +74,7 @@ class Call(base_command.BaseCommand):
if self.options.rawprint:
return data
+
return pprint.pformat(data)
def do(self, args):
@@ -99,7 +101,7 @@ class Call(base_command.BaseCommand):
# self.getOverlord()
- self.interactive = True
+ self.interactive = False
self.server_spec = self.parentCommand.server_spec
self.getOverlord()
@@ -111,4 +113,8 @@ class Call(base_command.BaseCommand):
# probably as a higher level module.
# dump the return code stuff atm till we figure out the right place for it
- return self.format_return(results)
+ foo = self.format_return(results)
+ print foo
+
+ # nothing really makes use of this atm -akl
+ return foo