From: Kefu Chai <kchai@redhat.com>
Date: Wed, 18 Oct 2017 09:41:45 +0000 (+0800)
Subject: ceph.in: do not panic at control+d in interactive mode
X-Git-Tag: v13.0.1~501^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c05060fb9b94834b829f87c34d88319c00a64bbd;p=ceph.git

ceph.in: do not panic at control+d in interactive mode

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/ceph.in b/src/ceph.in
index daec299376450..79bec56261dc0 100755
--- a/src/ceph.in
+++ b/src/ceph.in
@@ -539,7 +539,11 @@ def new_style_command(parsed_args, cmdargs, target, sigdict, inbuf, verbose):
                 import readline  # noqa
 
             while True:
-                interactive_input = read_input()
+                try:
+                    interactive_input = read_input()
+                except EOFError:
+                    # leave user an uncluttered prompt
+                    return 0, '\n', ''
                 if interactive_input is None:
                     return 0, '', ''
                 cmdargs = parse_cmdargs(shlex.split(interactive_input))[2]