diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2012-09-27 09:30:47 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2012-09-27 18:45:12 +0200 |
| commit | 2a797f29aa12f6847844af504026be52db659fbb (patch) | |
| tree | 8d3e4a6e2003239c5b69efd578c9452e0bc9b86d /source4/scripting/python/samba/dbchecker.py | |
| parent | 6986f7bdda56d693c642945485006f9660053758 (diff) | |
| download | samba-2a797f29aa12f6847844af504026be52db659fbb.tar.gz samba-2a797f29aa12f6847844af504026be52db659fbb.tar.xz samba-2a797f29aa12f6847844af504026be52db659fbb.zip | |
s4-python: Various formatting fixes.
* Trailing whitespace
* use of "==" where "is" should be used
* double spaces
Diffstat (limited to 'source4/scripting/python/samba/dbchecker.py')
| -rw-r--r-- | source4/scripting/python/samba/dbchecker.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/scripting/python/samba/dbchecker.py b/source4/scripting/python/samba/dbchecker.py index a6495fc8e1..e1be6c4faa 100644 --- a/source4/scripting/python/samba/dbchecker.py +++ b/source4/scripting/python/samba/dbchecker.py @@ -380,8 +380,8 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) m = ldb.Message() m.dn = obj.dn m['lastKnownParent'] = ldb.MessageElement(str(obj.dn.parent()), ldb.FLAG_MOD_REPLACE, 'lastKnownParent') - - if self.do_modify(m, [], + + if self.do_modify(m, [], "Failed to set lastKnownParent on lostAndFound object at %s" % (new_dn + lost_and_found)): self.report("Set lastKnownParent on lostAndFound object at %s" % (new_dn + lost_and_found)) keep_transaction = True @@ -473,7 +473,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) if is_deleted and not target_is_deleted and reverse_link_name is not None: revealed_dn = self.find_revealed_link(obj.dn, attrname, guid) rmd_flags = revealed_dn.dn.get_extended_component("RMD_FLAGS") - if rmd_flags != None and (int(rmd_flags) & 1) == 0: + if rmd_flags is not None and (int(rmd_flags) & 1) == 0: # the RMD_FLAGS for this link should be 1, as the target is deleted self.err_incorrect_rmd_flags(obj, attrname, revealed_dn) continue @@ -551,7 +551,7 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) return True if dn == self.rid_dn: return True - + return False def calculate_instancetype(self, dn): |