From f547a9939cc69ea69a9087b3dd88d1b2f138680f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 14 Aug 2013 22:16:46 -0700 Subject: ceph: fix return code for --admin-daemon Simplify this by making it take the same path as the (new) 'daemon ...' syntax. Backport: dumpling Signed-off-by: Sage Weil --- src/ceph.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/ceph.in b/src/ceph.in index fe369f82467..2baa9b5e133 100755 --- a/src/ceph.in +++ b/src/ceph.in @@ -507,11 +507,7 @@ def main(): format = parsed_args.output_format if parsed_args.admin_socket: - try: - print admin_socket(parsed_args.admin_socket, childargs, format) - except Exception as e: - print >> sys.stderr, 'admin_socket: {0}'.format(e) - return 0 + childargs = [ 'daemon', parsed_args.admin_socket ] + childargs if len(childargs) > 0 and childargs[0] == "daemon": if len(childargs) > 2: -- cgit v1.2.1