From: Douglas Bagnall Date: Thu, 3 Dec 2020 22:53:48 +0000 (+1300) Subject: dbcheck: err_normalise-mismatch_replace: no msg if no error X-Git-Tag: samba-4.14.0rc1~466 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc9ff79d86c64cc25c5618866c95f308204716dd;p=thirdparty%2Fsamba.git dbcheck: err_normalise-mismatch_replace: no msg if no error Signed-off-by: Douglas Bagnall Reviewed-by: Noel Power Autobuild-User(master): Noel Power Autobuild-Date(master): Wed Dec 9 17:04:23 UTC 2020 on sn-devel-184 --- 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