diff options
| author | Jason Gerard DeRose <jderose@redhat.com> | 2009-12-09 09:09:53 -0700 |
|---|---|---|
| committer | Jason Gerard DeRose <jderose@redhat.com> | 2009-12-10 08:29:15 -0700 |
| commit | b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7 (patch) | |
| tree | 7e5329a51af169ce34a7d275a1bbd63c1e31c026 /ipaserver | |
| parent | d08b8858ddc3bf6265f6ea8acae6661b9fff5112 (diff) | |
| download | freeipa-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.tar.gz freeipa-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.tar.xz freeipa-b6e4972e7f6aa08e0392a2cf441b60ab0e7d88b7.zip | |
Take 2: Extensible return values and validation; steps toward a single output_for_cli(); enable more webUI stuff
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/plugins/join.py | 3 | ||||
| -rw-r--r-- | ipaserver/rpcserver.py | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ipaserver/plugins/join.py b/ipaserver/plugins/join.py index 08b1596ed..34f4c58cb 100644 --- a/ipaserver/plugins/join.py +++ b/ipaserver/plugins/join.py @@ -72,6 +72,9 @@ class join(Command): ), ) + has_output = tuple() + use_output_validation = False + def execute(self, hostname, **kw): """ Execute the machine join operation. diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py index 24213dd67..9400ac367 100644 --- a/ipaserver/rpcserver.py +++ b/ipaserver/rpcserver.py @@ -77,7 +77,7 @@ def extract_query(environ): qstr = environ['QUERY_STRING'] if qstr: query = dict(nicify_query( - parse_qs(qstr, keep_blank_values=True) + parse_qs(qstr)#, keep_blank_values=True) )) else: query = {} @@ -125,6 +125,9 @@ class WSGIExecutioner(Executioner): error = InternalError() finally: destroy_context() + self.debug('Returning:\n%s', + json.dumps(result, sort_keys=True, indent=4) + ) return self.marshal(result, error, _id) def simple_unmarshal(self, environ): |