summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ipalib/cli.py2
-rw-r--r--ipaserver/rpcserver.py6
2 files changed, 6 insertions, 2 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index 5cf688527..fb2fd95f4 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -807,7 +807,7 @@ class CLI(object):
else:
kw['action'] = 'store_true'
else:
- kw['metavar'] = metavar=option.type.name.upper()
+ kw['metavar'] = metavar=option.__class__.__name__.upper()
o = optparse.make_option('--%s' % to_cli(option.cli_name), **kw)
parser.add_option(o)
return parser
diff --git a/ipaserver/rpcserver.py b/ipaserver/rpcserver.py
index d7f2ee1a6..8b16eda93 100644
--- a/ipaserver/rpcserver.py
+++ b/ipaserver/rpcserver.py
@@ -53,7 +53,11 @@ class xmlserver(Backend):
result = self.Command[method](*args, **options)
return (result,) # Must wrap XML-RPC response in a tuple singleton
- def execute(self, data, ccache=None, client_ip=None, languages=None):
+ def execute(self, data, ccache=None, client_version=None,
+ client_ip=None, languages=None):
+ """
+ Execute the XML-RPC request in contained in ``data``.
+ """
try:
(params, method) = xml_loads(data)
response = self.dispatch(method, params)