mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2025-02-25 18:55:28 -06:00
Be more forgiving when trying to replace older DS schema.
We have to replace 05rfc2247.ldif because it contains some conflicting attributes with DNS in some older versions of 389-DS/RHDS. This fails on some newer versions of 389-DS/RHDS so this lets it continue installing if the new file is not needed.
This commit is contained in:
parent
4a350213b7
commit
0573389370
@ -274,10 +274,14 @@ class DsInstance(service.Service):
|
||||
schema_dirname(self.serverid) + "60basev2.ldif")
|
||||
shutil.copyfile(ipautil.SHARE_DIR + "60policyv2.ldif",
|
||||
schema_dirname(self.serverid) + "60policyv2.ldif")
|
||||
shutil.move(schema_dirname(self.serverid) + "05rfc2247.ldif",
|
||||
schema_dirname(self.serverid) + "05rfc2247.ldif.old")
|
||||
shutil.copyfile(ipautil.SHARE_DIR + "05rfc2247.ldif",
|
||||
schema_dirname(self.serverid) + "05rfc2247.ldif")
|
||||
try:
|
||||
shutil.move(schema_dirname(self.serverid) + "05rfc2247.ldif",
|
||||
schema_dirname(self.serverid) + "05rfc2247.ldif.old")
|
||||
shutil.copyfile(ipautil.SHARE_DIR + "05rfc2247.ldif",
|
||||
schema_dirname(self.serverid) + "05rfc2247.ldif")
|
||||
except IOError:
|
||||
# Does not apply with newer DS releases
|
||||
pass
|
||||
|
||||
def __restart_instance(self):
|
||||
try:
|
||||
|
Loading…
Reference in New Issue
Block a user