From: Kefu Chai <kchai@redhat.com>
Date: Fri, 24 Apr 2015 06:04:30 +0000 (+0800)
Subject: ceph.in: handle unknown Exception correctly
X-Git-Tag: v0.94.3~47^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F4776%2Fhead;p=ceph.git

ceph.in: handle unknown Exception correctly

* in case parse_cmdargs() throws

Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 7789eefc01deb9ca7fe90f5521aece3e36c3c350)
---

diff --git a/src/ceph.in b/src/ceph.in
index 8de12324655..2b6adf4dc57 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -446,7 +446,7 @@ def new_style_command(parsed_args, cmdargs, target, sigdict, inbuf, verbose):
                 except Exception as e:
                     print >> sys.stderr, \
                             'error handling command target: {0}'.format(e)
-                    return 1
+                    return 1, '', ''
                 valid_dict = validate_command(sigdict, cmdargs, verbose)
                 if valid_dict:
                     if parsed_args.output_format: