summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Babinsky <mbabinsk@redhat.com>2015-12-16 10:56:06 +0100
committerMartin Basti <mbasti@redhat.com>2016-01-13 09:51:08 +0100
commit00c13fd340eedafe062ec5df56cdb689a5483589 (patch)
tree453b2e7719377b0035158b56c06a9146d6c611df
parentfe94222873c4df5118e93cebe7e9d69439266ba0 (diff)
downloadfreeipa-00c13fd340eedafe062ec5df56cdb689a5483589.tar.gz
freeipa-00c13fd340eedafe062ec5df56cdb689a5483589.tar.xz
freeipa-00c13fd340eedafe062ec5df56cdb689a5483589.zip
fix Py3 incompatible exception instantiation in replica install code
https://fedorahosted.org/freeipa/ticket/5585 Reviewed-By: Tomas Babej <tbabej@redhat.com>
-rw-r--r--ipaserver/install/server/replicainstall.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py
index 150325b82..7edee88e1 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)
@@ -895,7 +895,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")