IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

LGTM: Fix multiple use before assignment

Browse Source 
- Move assignment before try/finally block
- Add raise to indicate control flow change
- Add default value

https://pagure.io/freeipa/issue/7344

Signed-off-by: Christian Heimes <cheimes@redhat.com>
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
This commit is contained in:
Christian Heimes
2018-01-03 11:09:41 +01:00
parent dc599e0797
commit 73ee9ff40e
9 changed files with 45 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ipaserver/plugins/trust.py
View File

@@ -1808,7 +1808,8 @@ class trustdomain_enable(LDAPQuery):
trust_dn = self.obj.get_dn(keys[0], trust_type=u'ad')
trust_entry = ldap.get_entry(trust_dn)
except errors.NotFound:
self.api.Object[self.obj.parent_object].handle_not_found(keys[0])
self.api.Object[self.obj.parent_object].handle_not_found(
keys[0])
dn = self.obj.get_dn(keys[0], keys[1], trust_type=u'ad')
try:
@@ -1849,13 +1850,14 @@ class trustdomain_disable(LDAPQuery):
trust_dn = self.obj.get_dn(keys[0], trust_type=u'ad')
trust_entry = ldap.get_entry(trust_dn)
except errors.NotFound:
self.api.Object[self.obj.parent_object].handle_not_found(keys[0])
self.api.Object[self.obj.parent_object].handle_not_found(
keys[0])
dn = self.obj.get_dn(keys[0], keys[1], trust_type=u'ad')
try:
entry = ldap.get_entry(dn)
sid = entry.single_value.get('ipanttrusteddomainsid', None)
if not (sid in trust_entry['ipantsidblacklistincoming']):
if sid not in trust_entry['ipantsidblacklistincoming']:
trust_entry['ipantsidblacklistincoming'].append(sid)
ldap.update_entry(trust_entry)
else: