diff options
| author | Martin Babinsky <mbabinsk@redhat.com> | 2016-11-28 14:50:57 +0100 |
|---|---|---|
| committer | Martin Babinsky <mbabinsk@redhat.com> | 2016-12-02 13:00:06 +0100 |
| commit | 0ae7bebb7690620b69fd9c84b7a385c2086c1ee1 (patch) | |
| tree | 79cb84e3b9b9eb8155477f1bb946ceaf0f1708bc /ipaclient/plugins/misc.py | |
| parent | 42307ae2dc4d9be06d3fd9b7e5af2e0761b8d6ad (diff) | |
| download | freeipa-0ae7bebb7690620b69fd9c84b7a385c2086c1ee1.tar.gz freeipa-0ae7bebb7690620b69fd9c84b7a385c2086c1ee1.tar.xz freeipa-0ae7bebb7690620b69fd9c84b7a385c2086c1ee1.zip | |
Make `env` and `plugins` commands local again
During thin client refactoring, LocalOrRemote class implementation of `run`
method was overriden by default Command implementation during instantiation of
client plugins from schema. This caused these commands to always forward this
request to IPA master.
This patch restores the original behavior: unless `--server` option was
specified, the commands will always print out local config.
https://fedorahosted.org/freeipa/ticket/6490
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
Diffstat (limited to 'ipaclient/plugins/misc.py')
| -rw-r--r-- | ipaclient/plugins/misc.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/ipaclient/plugins/misc.py b/ipaclient/plugins/misc.py index 2c195f866..f4f2f077a 100644 --- a/ipaclient/plugins/misc.py +++ b/ipaclient/plugins/misc.py @@ -2,14 +2,15 @@ # Copyright (C) 2016 FreeIPA Contributors see COPYING for license # -from ipaclient.frontend import CommandOverride +from ipalib.misc import env as _env +from ipalib.misc import plugins as _plugins from ipalib.plugable import Registry register = Registry() @register(override=True, no_fail=True) -class env(CommandOverride): +class env(_env): def output_for_cli(self, textui, output, *args, **options): output = dict(output) output.pop('count', None) @@ -20,7 +21,7 @@ class env(CommandOverride): @register(override=True, no_fail=True) -class plugins(CommandOverride): +class plugins(_plugins): def output_for_cli(self, textui, output, *args, **options): options['all'] = True return super(plugins, self).output_for_cli(textui, output, |