summaryrefslogtreecommitdiffstats
path: root/ipalib/cli.py
diff options
context:
space:
mode:
authorJan Cholasta <jcholast@redhat.com>2013-01-09 18:09:10 +0100
committerRob Crittenden <rcritten@redhat.com>2013-02-19 11:08:11 -0500
commitcfbdeebe66c1759ba49da84a0a5d2acfc184e4f3 (patch)
tree44eb4d446ba67376be87ffab8b0dbac076efea79 /ipalib/cli.py
parent1c68c3edff0507ee78cd1f633e45ae8c3fb9638d (diff)
downloadfreeipa-cfbdeebe66c1759ba49da84a0a5d2acfc184e4f3.tar.gz
freeipa-cfbdeebe66c1759ba49da84a0a5d2acfc184e4f3.tar.xz
freeipa-cfbdeebe66c1759ba49da84a0a5d2acfc184e4f3.zip
Run interactive_prompt callbacks after CSV values are split.
https://fedorahosted.org/freeipa/ticket/3334
Diffstat (limited to 'ipalib/cli.py')
-rw-r--r--ipalib/cli.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ca186c73..3d59e4a0 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -1045,6 +1045,14 @@ class cli(backend.Executioner):
if self.env.interactive:
self.prompt_interactively(cmd, kw)
kw = cmd.split_csv(**kw)
+ if self.env.interactive:
+ try:
+ callbacks = cmd.get_callbacks('interactive_prompt')
+ except AttributeError:
+ pass
+ else:
+ for callback in callbacks:
+ callback(cmd, kw)
kw['version'] = API_VERSION
self.load_files(cmd, kw)
return kw
@@ -1207,14 +1215,6 @@ class cli(backend.Executioner):
param.label, param.confirm
)
- try:
- callbacks = cmd.get_callbacks('interactive_prompt')
- except AttributeError:
- pass
- else:
- for callback in callbacks:
- callback(cmd, kw)
-
def load_files(self, cmd, kw):
"""
Load files from File parameters.