diff options
| author | Rob Crittenden <rcritten@redhat.com> | 2009-10-14 11:50:00 -0400 |
|---|---|---|
| committer | Rob Crittenden <rcritten@redhat.com> | 2009-10-16 14:56:49 -0400 |
| commit | 057338937018d5a05e9c51c75c5fb352b2742499 (patch) | |
| tree | c4785a92e9c27836a1d529e735871f0fd8b093bd /ipaserver/install/dsinstance.py | |
| parent | 4a350213b738045635a73ace341946b7f7406cb3 (diff) | |
| download | freeipa-057338937018d5a05e9c51c75c5fb352b2742499.tar.gz freeipa-057338937018d5a05e9c51c75c5fb352b2742499.tar.xz freeipa-057338937018d5a05e9c51c75c5fb352b2742499.zip | |
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.
Diffstat (limited to 'ipaserver/install/dsinstance.py')
| -rw-r--r-- | ipaserver/install/dsinstance.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ipaserver/install/dsinstance.py b/ipaserver/install/dsinstance.py index ea9f26da2..254c575c0 100644 --- a/ipaserver/install/dsinstance.py +++ b/ipaserver/install/dsinstance.py @@ -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: |