summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/cli.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ipalib/cli.py b/ipalib/cli.py
index ab7e36204..4e5e433ed 100644
--- a/ipalib/cli.py
+++ b/ipalib/cli.py
@@ -270,7 +270,7 @@ class CLI(object):
self.print_commands()
print 'ipa: ERROR: unknown command %r' % key
sys.exit(2)
- self.run_cmd(
+ return self.run_cmd(
self[key],
list(s.decode('utf-8') for s in args[1:])
)
@@ -280,7 +280,11 @@ class CLI(object):
try:
self.run_interactive(cmd, kw)
except KeyboardInterrupt:
- return
+ return 0
+ except errors.RuleError, e:
+ print e
+ return 2
+ return 0
def run_interactive(self, cmd, kw):
for param in cmd.params():