diff options
| author | Petr Viktorin <pviktori@redhat.com> | 2013-10-04 13:28:16 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-10-04 15:41:56 +0200 |
| commit | c813b8fbd39c700e25f591080a1e2d0d1645a173 (patch) | |
| tree | ce1873b02345af54a7529b734495cf23ceedacf4 /ipaserver | |
| parent | 5824a0e14e73f8d13a93ccccf1b5213488ff9eaa (diff) | |
| download | freeipa-c813b8fbd39c700e25f591080a1e2d0d1645a173.tar.gz freeipa-c813b8fbd39c700e25f591080a1e2d0d1645a173.tar.xz freeipa-c813b8fbd39c700e25f591080a1e2d0d1645a173.zip | |
Do not fail upgrade if the global anonymous read ACI is not found
This helps forward compatibility: the anon ACI is scheduled for removal.
https://fedorahosted.org/freeipa/ticket/3956
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/plugins/update_anonymous_aci.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ipaserver/install/plugins/update_anonymous_aci.py b/ipaserver/install/plugins/update_anonymous_aci.py index af4196a6..2e01217f 100644 --- a/ipaserver/install/plugins/update_anonymous_aci.py +++ b/ipaserver/install/plugins/update_anonymous_aci.py @@ -20,7 +20,7 @@ from copy import deepcopy from ipaserver.install.plugins import FIRST, LAST from ipaserver.install.plugins.baseupdate import PostUpdate -from ipalib import api +from ipalib import api, errors from ipalib.aci import ACI from ipalib.plugins import aci from ipapython.ipa_log_manager import * @@ -42,7 +42,11 @@ class update_anonymous_aci(PostUpdate): acistrs = entry_attrs.get('aci', []) acilist = aci._convert_strings_to_acis(entry_attrs.get('aci', [])) - rawaci = aci._find_aci_by_name(acilist, aciprefix, aciname) + try: + rawaci = aci._find_aci_by_name(acilist, aciprefix, aciname) + except errors.NotFound: + root_logger.error('Anonymous ACI not found, cannot update it') + return False, False, [] attrs = rawaci.target['targetattr']['expression'] rawfilter = rawaci.target.get('targetfilter', None) |