diff options
| -rw-r--r-- | ipalib/cli.py | 2 | ||||
| -rw-r--r-- | ipalib/parameters.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py index f54e6e75..64ace035 100644 --- a/ipalib/cli.py +++ b/ipalib/cli.py @@ -764,7 +764,7 @@ class cli(backend.Executioner): ) if option.password and self.env.interactive: kw['action'] = 'store_true' - elif option.type is bool: + elif option.type is bool and option.autofill: if option.default is True: kw['action'] = 'store_false' else: diff --git a/ipalib/parameters.py b/ipalib/parameters.py index 8a1aede9..68264af4 100644 --- a/ipalib/parameters.py +++ b/ipalib/parameters.py @@ -799,8 +799,8 @@ class Bool(Param): # FIXME: This my quick hack to get some UI stuff working, change these defaults # --jderose 2009-08-28 kwargs = Param.kwargs + ( - ('truths', frozenset, frozenset([1, u'1', u'True'])), - ('falsehoods', frozenset, frozenset([0, u'0', u'False'])), + ('truths', frozenset, frozenset([1, u'1', u'true'])), + ('falsehoods', frozenset, frozenset([0, u'0', u'false'])), ) def _convert_scalar(self, value, index=None): @@ -809,6 +809,8 @@ class Bool(Param): """ if type(value) is self.type: return value + if isinstance(value, basestring): + value = value.lower() if value in self.truths: return True if value in self.falsehoods: |