From 296656789c1bc8e2667c989d10cac300f8b5b7fc Mon Sep 17 00:00:00 2001 From: Martin Basti Date: Mon, 24 Nov 2014 12:46:37 +0100 Subject: [PATCH] Fix detection of encoding in zonemgr option Ticket: https://fedorahosted.org/freeipa/ticket/4762 Reviewed-By: Jan Cholasta --- ipaserver/install/bindinstance.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ipaserver/install/bindinstance.py b/ipaserver/install/bindinstance.py index 5bf784e62aec7c323a84fc5130e53c3deb86e6fd..f02fe8647dd38d05734311406152c50108077561 100644 --- a/ipaserver/install/bindinstance.py +++ b/ipaserver/install/bindinstance.py @@ -401,13 +401,14 @@ def zonemgr_callback(option, opt_str, value, parser): """ Properly validate and convert --zonemgr Option to IA5String """ - # validate the value first - try: - # IDNA support requires unicode - value = value.decode(sys.stdin.encoding) - validate_zonemgr_str(value) - except ValueError, e: - parser.error("invalid zonemgr: " + unicode(e)) + if value is not None: + # validate the value first + try: + # IDNA support requires unicode + value = value.decode(getattr(sys.stdin, 'encoding', 'utf-8')) + validate_zonemgr_str(value) + except ValueError, e: + parser.error("invalid zonemgr: " + unicode(e)) parser.values.zonemgr = value -- 2.1.0