IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix Py3 incompatible exception instantiation in replica install code

Browse Source 
https://fedorahosted.org/freeipa/ticket/5585

Reviewed-By: Tomas Babej <tbabej@redhat.com>
This commit is contained in:
Martin Babinsky 2015-12-16 10:56:06 +01:00 committed by Martin Basti
parent fe94222873
commit 00c13fd340
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/install/server/replicainstall.py
View File

@ -335,7 +335,7 @@ def configure_certmonger():
messagebus = services.knownservices.messagebus messagebus = services.knownservices.messagebus
try: try:
messagebus.start() messagebus.start()
except Exception, e: except Exception as e:
print("Messagebus service unavailable: %s" % str(e)) print("Messagebus service unavailable: %s" % str(e))
sys.exit(3) sys.exit(3)
@ -344,13 +344,13 @@ def configure_certmonger():
cmonger = services.knownservices.certmonger cmonger = services.knownservices.certmonger
try: try:
cmonger.restart() cmonger.restart()
except Exception, e: except Exception as e:
print("Certmonger service unavailable: %s" % str(e)) print("Certmonger service unavailable: %s" % str(e))
sys.exit(3) sys.exit(3)
try: try:
cmonger.enable() cmonger.enable()
except Exception, e: except Exception as e:
print("Failed to enable Certmonger: %s" % str(e)) print("Failed to enable Certmonger: %s" % str(e))
sys.exit(3) sys.exit(3)
@ -895,7 +895,7 @@ def promote_check(installer):
if not options.no_ntp: if not options.no_ntp:
try: try:
ipaclient.ntpconf.check_timedate_services() ipaclient.ntpconf.check_timedate_services()
except ipaclient.ntpconf.NTPConflictingService, e: except ipaclient.ntpconf.NTPConflictingService as e:
print("WARNING: conflicting time&date synchronization service '%s'" print("WARNING: conflicting time&date synchronization service '%s'"
" will" % e.conflicting_service) " will" % e.conflicting_service)
print("be disabled in favor of ntpd") print("be disabled in favor of ntpd")