--
Martin^3 Babinsky
From 2cd363bedcf08c8fd941b34e048b9c5eed3e09f1 Mon Sep 17 00:00:00 2001
From: Martin Babinsky <[email protected]>
Date: Wed, 16 Dec 2015 10:56:06 +0100
Subject: [PATCH] fix Py3 incompatible exception instantiation in replica
install code
---
ipaserver/install/server/replicainstall.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 78e32ae9b6ee5aacef9a1db055f576a996fd03f0..2adf4a0b773ab466e3df3d75ce2e8afe345f9240 100644
--- a/ipaserver/install/server/replicainstall.py
+++ b/ipaserver/install/server/replicainstall.py
@@ -335,7 +335,7 @@ def configure_certmonger():
messagebus = services.knownservices.messagebus
try:
messagebus.start()
- except Exception, e:
+ except Exception as e:
print("Messagebus service unavailable: %s" % str(e))
sys.exit(3)
@@ -344,13 +344,13 @@ def configure_certmonger():
cmonger = services.knownservices.certmonger
try:
cmonger.restart()
- except Exception, e:
+ except Exception as e:
print("Certmonger service unavailable: %s" % str(e))
sys.exit(3)
try:
cmonger.enable()
- except Exception, e:
+ except Exception as e:
print("Failed to enable Certmonger: %s" % str(e))
sys.exit(3)
@@ -893,7 +893,7 @@ def promote_check(installer):
if not options.no_ntp:
try:
ipaclient.ntpconf.check_timedate_services()
- except ipaclient.ntpconf.NTPConflictingService, e:
+ except ipaclient.ntpconf.NTPConflictingService as e:
print("WARNING: conflicting time&date synchronization service '%s'"
" will" % e.conflicting_service)
print("be disabled in favor of ntpd")
--
2.5.0
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code