diff options
| author | Jan Cholasta <jcholast@redhat.com> | 2013-09-10 10:20:24 +0000 |
|---|---|---|
| committer | Petr Viktorin <pviktori@redhat.com> | 2013-11-05 13:56:55 +0100 |
| commit | df5f4ee81d1aff1122dd92ab1b56eb335294c3a7 (patch) | |
| tree | b112b429a896789029038bd3e25218495b647d56 /ipaserver/install/ipa_restore.py | |
| parent | 989493979da3ef1136a9b346cace5689ef22eed8 (diff) | |
| download | freeipa.git-df5f4ee81d1aff1122dd92ab1b56eb335294c3a7.tar.gz freeipa.git-df5f4ee81d1aff1122dd92ab1b56eb335294c3a7.tar.xz freeipa.git-df5f4ee81d1aff1122dd92ab1b56eb335294c3a7.zip | |
Turn LDAPEntry.single_value into a dictionary-like property.
This change makes single_value consistent with the raw property.
https://fedorahosted.org/freeipa/ticket/3521
Diffstat (limited to 'ipaserver/install/ipa_restore.py')
| -rw-r--r-- | ipaserver/install/ipa_restore.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ipaserver/install/ipa_restore.py b/ipaserver/install/ipa_restore.py index 82113716..8443dee4 100644 --- a/ipaserver/install/ipa_restore.py +++ b/ipaserver/install/ipa_restore.py @@ -349,7 +349,7 @@ class Restore(admintool.AdminTool): raise admintool.ScriptError( "Failed to read master data: %s" % e) else: - masters = [ent.single_value('cn') for ent in entries] + masters = [ent.single_value['cn'] for ent in entries] for master in masters: if master == api.env.host: @@ -368,10 +368,10 @@ class Restore(admintool.AdminTool): except errors.NotFound: continue - services_cns = [s.single_value('cn') for s in services] + services_cns = [s.single_value['cn'] for s in services] host_entries = repl.find_ipa_replication_agreements() - hosts = [rep.single_value('nsds5replicahost', None) + hosts = [rep.single_value.get('nsds5replicahost') for rep in host_entries] for host in hosts: @@ -386,7 +386,7 @@ class Restore(admintool.AdminTool): self.log.critical("Unable to disable agreement on %s: %s" % (master, e)) host_entries = repl.find_ipa_replication_agreements() - hosts = [rep.single_value('nsds5replicahost', None) + hosts = [rep.single_value.get('nsds5replicahost') for rep in host_entries] for host in hosts: self.log.info('Disabling CA replication agreement on %s to %s' % (master, host)) |