Fix NotFound error messages in hbacrule commands so that the text is consistent with the rest of the framework.
https://fedorahosted.org/freeipa/ticket/1861
>From ff3584bc280a11b28e0377a8c061a755d6b3ce9e Mon Sep 17 00:00:00 2001 From: Martin Kosek <mko...@redhat.com> Date: Mon, 26 Sep 2011 09:20:03 +0200 Subject: [PATCH] Fix error messages in hbacrule Fix NotFound error messages in hbacrule commands so that the text is consistent with the rest of the framework. https://fedorahosted.org/freeipa/ticket/1861 --- ipalib/plugins/hbacrule.py | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py index 22a6a0dc654523bd48b69978a51df7d9707b9ddd..f9f04529f4829a05d4b03f4c8628066ddf6089df 100644 --- a/ipalib/plugins/hbacrule.py +++ b/ipalib/plugins/hbacrule.py @@ -424,7 +424,10 @@ class hbacrule_add_user(LDAPAddMember): member_count_out = ('%i object added.', '%i objects added.') def pre_callback(self, ldap, dn, found, not_found, *keys, **options): - (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + try: + (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + except errors.NotFound: + self.obj.handle_not_found(*keys) if 'usercategory' in entry_attrs and \ entry_attrs['usercategory'][0].lower() == 'all': raise errors.MutuallyExclusiveError(reason="users cannot be added when user category='all'") @@ -449,7 +452,10 @@ class hbacrule_add_host(LDAPAddMember): member_count_out = ('%i object added.', '%i objects added.') def pre_callback(self, ldap, dn, found, not_found, *keys, **options): - (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + try: + (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + except errors.NotFound: + self.obj.handle_not_found(*keys) if 'hostcategory' in entry_attrs and \ entry_attrs['hostcategory'][0].lower() == 'all': raise errors.MutuallyExclusiveError(reason="hosts cannot be added when host category='all'") @@ -474,7 +480,10 @@ class hbacrule_add_sourcehost(LDAPAddMember): member_count_out = ('%i object added.', '%i objects added.') def pre_callback(self, ldap, dn, found, not_found, *keys, **options): - (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + try: + (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + except errors.NotFound: + self.obj.handle_not_found(*keys) if 'sourcehostcategory' in entry_attrs and \ entry_attrs['sourcehostcategory'][0].lower() == 'all': raise errors.MutuallyExclusiveError(reason="source hosts cannot be added when sourcehost category='all'") @@ -552,7 +561,10 @@ class hbacrule_add_service(LDAPAddMember): member_count_out = ('%i object added.', '%i objects added.') def pre_callback(self, ldap, dn, found, not_found, *keys, **options): - (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + try: + (dn, entry_attrs) = ldap.get_entry(dn, self.obj.default_attributes) + except errors.NotFound: + self.obj.handle_not_found(*keys) if 'servicecategory' in entry_attrs and \ entry_attrs['servicecategory'][0].lower() == 'all': raise errors.MutuallyExclusiveError(reason="services cannot be added when service category='all'") -- 1.7.6.2
_______________________________________________ Freeipa-devel mailing list Freeipa-devel@redhat.com https://www.redhat.com/mailman/listinfo/freeipa-devel
