summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Client/__init__.py
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-06-19 08:52:39 -0500
committerSol Jerome <sol.jerome@gmail.com>2014-06-19 08:52:39 -0500
commit359effb59814057c793f4a3653cd412fbedf6b2e (patch)
treea75a499d5e1481daa8effa42e2ea2669996335c3 /src/lib/Bcfg2/Client/__init__.py
parent5f35edff0a098ecc4853c5c96f616ec159ecfb09 (diff)
downloadbcfg2-359effb59814057c793f4a3653cd412fbedf6b2e.tar.gz
bcfg2-359effb59814057c793f4a3653cd412fbedf6b2e.tar.bz2
bcfg2-359effb59814057c793f4a3653cd412fbedf6b2e.zip
Client: Handle ^C when in interactive mode
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Diffstat (limited to 'src/lib/Bcfg2/Client/__init__.py')
-rw-r--r--src/lib/Bcfg2/Client/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py
index 3da80067d..f1b32d929 100644
--- a/src/lib/Bcfg2/Client/__init__.py
+++ b/src/lib/Bcfg2/Client/__init__.py
@@ -69,8 +69,8 @@ def prompt(msg):
except UnicodeEncodeError:
ans = input(msg.encode('utf-8'))
return ans in ['y', 'Y']
- except EOFError:
- # handle ^C on rhel-based platforms
+ except (EOFError, KeyboardInterrupt):
+ # handle ^C
raise SystemExit(1)
except:
print("Error while reading input: %s" % sys.exc_info()[1])