From f264b53a2ed8146738d74d1bbe5c1bd679661b16 Mon Sep 17 00:00:00 2001 From: Tim Burke Date: Sun, 16 Oct 2022 21:58:36 -0700 Subject: ring-builder: Abort cleanly on ^C, ^D Change-Id: If8fbcaff8e5676accb10e6c3c49387bc0de0cdb9 --- swift/cli/ringbuilder.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/swift/cli/ringbuilder.py b/swift/cli/ringbuilder.py index 001919d52..62b956023 100644 --- a/swift/cli/ringbuilder.py +++ b/swift/cli/ringbuilder.py @@ -194,7 +194,11 @@ def check_devs(devs, input_question, opts, abort_msg): print('Matched more than one device:') for dev in devs: print(' %s' % format_device(dev)) - if not opts.yes and input(input_question) != 'y': + try: + abort = not opts.yes and input(input_question) != 'y' + except (EOFError, KeyboardInterrupt): + abort = True + if abort: print(abort_msg) exit(EXIT_ERROR) -- cgit v1.2.1