diff options
| author | Douglas Bagnall <douglas.bagnall@catalyst.net.nz> | 2020-12-04 11:53:48 +1300 |
|---|---|---|
| committer | Noel Power <npower@samba.org> | 2020-12-09 17:04:23 +0000 |
| commit | cc9ff79d86c64cc25c5618866c95f308204716dd (patch) | |
| tree | 6ddaef961e20048556ebbfab1df28758f58f6153 /python | |
| parent | f1be8813b01227c0c18052b622899026eb4b14d0 (diff) | |
| download | samba-cc9ff79d86c64cc25c5618866c95f308204716dd.tar.gz | |
dbcheck: err_normalise-mismatch_replace: no msg if no error
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
Autobuild-User(master): Noel Power <npower@samba.org>
Autobuild-Date(master): Wed Dec 9 17:04:23 UTC 2020 on sn-devel-184
Diffstat (limited to 'python')
| -rw-r--r-- | python/samba/dbchecker.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index 67583376323..28b56edaafb 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -513,10 +513,11 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) def err_normalise_mismatch_replace(self, dn, attrname, values): '''fix attribute normalisation and/or sort errors''' normalised = self.samdb.dsdb_normalise_attributes(self.samdb_schema, attrname, values) - self.report("ERROR: Normalisation error for attribute '%s' in '%s'" % (attrname, dn)) - self.report("Values/Order of values do/does not match: %s/%s!" % (values, list(normalised))) if list(normalised) == values: + # how we got here is a mystery. return + self.report("ERROR: Normalisation error for attribute '%s' in '%s'" % (attrname, dn)) + self.report("Values/Order of values do/does not match: %s/%s!" % (values, list(normalised))) if not self.confirm_all("Fix normalisation for '%s' from '%s'?" % (attrname, dn), 'fix_all_normalisation'): self.report("Not fixing attribute '%s'" % attrname) return |