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

Raise errors from service.py:_ldap_mod() by default

Browse Source 
This is to prevent situations when installer prints
CRITICAL Failed to load ....ldif
and continues just to crash later on because of non-existing LDAP container
or so on.

Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
Petr Spacek 2016-04-26 19:42:00 +02:00 committed by Martin Basti
parent d70d71846d
commit c56256e2a2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipaserver/install/service.py
View File

@ -185,7 +185,7 @@ class Service(object):
self.admin_conn.unbind()
self.admin_conn = None
def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=False):
def _ldap_mod(self, ldif, sub_dict=None, raise_on_err=True):
pw_name = None
fd = None
path = ipautil.SHARE_DIR + ldif
@ -229,9 +229,9 @@ class Service(object):
try:
ipautil.run(args, nolog=nologlist)
except ipautil.CalledProcessError as e:
root_logger.critical("Failed to load %s: %s" % (ldif, str(e)))
if raise_on_err:
raise
root_logger.critical("Failed to load %s: %s" % (ldif, str(e)))
finally:
if pw_name:
os.remove(pw_name)