From f82463d4e2bf7c652db942608352ab2ce23ec69b Mon Sep 17 00:00:00 2001 From: Petr Viktorin Date: Mon, 10 Aug 2015 18:00:36 +0200 Subject: [PATCH] Remove use of sys.exc_value sys.exc_value is deprecated since Python 1.5, and was removed in Python 3. Reviewed-By: Christian Heimes Reviewed-By: Jan Cholasta --- install/tools/ipa-compat-manage | 4 ++-- install/tools/ipa-nis-manage | 4 ++-- ipa-client/ipa-install/ipa-client-install | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/tools/ipa-compat-manage b/install/tools/ipa-compat-manage index ee8ac6015..a7477c71c 100755 --- a/install/tools/ipa-compat-manage +++ b/install/tools/ipa-compat-manage @@ -30,13 +30,13 @@ try: from ipalib import api, errors from ipapython.ipa_log_manager import * from ipapython.dn import DN -except ImportError: +except ImportError as e: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The error was: %s -""" % sys.exc_value +""" % e sys.exit(1) compat_dn = DN(('cn', 'Schema Compatibility'), ('cn', 'plugins'), ('cn', 'config')) diff --git a/install/tools/ipa-nis-manage b/install/tools/ipa-nis-manage index 45b03c26f..4017230aa 100755 --- a/install/tools/ipa-nis-manage +++ b/install/tools/ipa-nis-manage @@ -32,13 +32,13 @@ try: from ipapython.ipa_log_manager import * from ipapython.dn import DN from ipaplatform import services -except ImportError: +except ImportError as e: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The error was: %s -""" % sys.exc_value +""" % e sys.exit(1) nis_config_dn = DN(('cn', 'NIS Server'), ('cn', 'plugins'), ('cn', 'config')) diff --git a/ipa-client/ipa-install/ipa-client-install b/ipa-client/ipa-install/ipa-client-install index 9352b0049..bce9f3ce1 100755 --- a/ipa-client/ipa-install/ipa-client-install +++ b/ipa-client/ipa-install/ipa-client-install @@ -57,13 +57,13 @@ try: from ipapython.ssh import SSHPublicKey from ipalib.rpc import delete_persistent_client_session_data -except ImportError: +except ImportError as e: print >> sys.stderr, """\ There was a problem importing one of the required Python modules. The error was: %s -""" % sys.exc_value +""" % e sys.exit(1) SUCCESS = 0