summaryrefslogtreecommitdiffstats
path: root/ipalib
diff options
context:
space:
mode:
authorMartin Kosek <mkosek@redhat.com>2011-09-26 09:20:03 +0200
committerMartin Kosek <mkosek@redhat.com>2011-09-27 15:37:01 +0200
commit43c968f554d8de1386fe369aba82ed7c37373e37 (patch)
treea9db08ce89d395e33a3239833036e2f4b315fe93 /ipalib
parentf76d33a296d9f0e48b0a6c32bfc87d33fabf3ec9 (diff)
downloadfreeipa-43c968f554d8de1386fe369aba82ed7c37373e37.tar.gz
freeipa-43c968f554d8de1386fe369aba82ed7c37373e37.tar.xz
freeipa-43c968f554d8de1386fe369aba82ed7c37373e37.zip
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
Diffstat (limited to 'ipalib')
-rw-r--r--ipalib/plugins/hbacrule.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/ipalib/plugins/hbacrule.py b/ipalib/plugins/hbacrule.py
index 22a6a0dc6..f9f04529f 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'")