IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix the procedure for getting default values of command parameters.

Browse Source 
The parameters used in default_from of other parameters are now
properly validated before the default_from is called.

ticket 1847
This commit is contained in:
Jan Cholasta
2012-01-16 09:21:50 -05:00
committed by Martin Kosek
parent 9bb1e6c03e
commit 5a55e11a25
3 changed files with 75 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipalib/cli.py
View File

@@ -48,7 +48,7 @@ import plugable
import util
from errors import (PublicError, CommandError, HelpError, InternalError,
NoSuchNamespaceError, ValidationError, NotFound, NotConfiguredError,
PromptFailed)
PromptFailed, ConversionError)
from constants import CLI_TAB
from parameters import Password, Bytes, File, Str, StrEnum
from text import _
@@ -1152,7 +1152,7 @@ class cli(backend.Executioner):
if (param.required and param.name not in kw) or \
(param.alwaysask and honor_alwaysask) or self.env.prompt_all:
if param.autofill:
kw[param.name] = param.get_default(**kw)
kw[param.name] = cmd.get_default_of(param.name, **kw)
if param.name in kw and kw[param.name] is not None:
continue
if param.password:
@@ -1160,7 +1160,7 @@ class cli(backend.Executioner):
param.label, param.confirm
)
else:
default = param.get_default(**kw)
default = cmd.get_default_of(param.name, **kw)
error = None
while True:
if error is not None:
@@ -1172,7 +1172,7 @@ class cli(backend.Executioner):
if value is not None:
kw[param.name] = value
break
except ValidationError, e:
except (ValidationError, ConversionError), e:
error = e.error
elif param.password and kw.get(param.name, False) is True:
kw[param.name] = self.Backend.textui.prompt_password(