diff options
| author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
|---|---|---|
| committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-18 09:45:10 -0500 |
| commit | 1405be5d896d7ae539044f28565de48095cceec8 (patch) | |
| tree | fa51d61777aac8adc72cc55bca64efa744fa7ac0 /src/lib/Bcfg2/Client/__init__.py | |
| parent | a7c2a14cfecf93d013556dcb703abb8e36bb45e5 (diff) | |
| parent | 259c84f9ddaaf0233a65e686bd8f3346ab0972b0 (diff) | |
| download | bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.gz bcfg2-1405be5d896d7ae539044f28565de48095cceec8.tar.bz2 bcfg2-1405be5d896d7ae539044f28565de48095cceec8.zip | |
Merge branch 'maint'
Signed-off-by: Sol Jerome <sol.jerome@gmail.com>
Conflicts:
src/lib/Bcfg2/Server/Plugins/Cfg/CfgPrivateKeyCreator.py
src/lib/Bcfg2/Server/Plugins/Packages/Yum.py
src/lib/Bcfg2/Server/Plugins/Properties.py
Diffstat (limited to 'src/lib/Bcfg2/Client/__init__.py')
| -rw-r--r-- | src/lib/Bcfg2/Client/__init__.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Client/__init__.py b/src/lib/Bcfg2/Client/__init__.py index 25603186e..6d1cb9d40 100644 --- a/src/lib/Bcfg2/Client/__init__.py +++ b/src/lib/Bcfg2/Client/__init__.py @@ -21,6 +21,9 @@ def prompt(msg): try: ans = input(msg) return ans in ['y', 'Y'] + except UnicodeEncodeError: + ans = input(msg.encode('utf-8')) + return ans in ['y', 'Y'] except EOFError: # handle ^C on rhel-based platforms raise SystemExit(1) |