From 713117401c85642dfa9de0772f0a9954a8b8d804 Mon Sep 17 00:00:00 2001 From: Douglas Bagnall Date: Fri, 4 Dec 2020 10:12:08 +1300 Subject: [PATCH] dbcheck: don't try to stringify values list twice dump_attr_values already turns it into a comma separated list. Signed-off-by: Douglas Bagnall Reviewed-by: Noel Power --- python/samba/dbchecker.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/samba/dbchecker.py b/python/samba/dbchecker.py index c11de3b3a94..6d16e88868e 100644 --- a/python/samba/dbchecker.py +++ b/python/samba/dbchecker.py @@ -539,7 +539,8 @@ newSuperior: %s""" % (str(from_dn), str(to_rdn), str(to_base))) def err_duplicate_values(self, dn, attrname, dup_values, values): '''fix duplicate attribute values''' self.report("ERROR: Duplicate values for attribute '%s' in '%s'" % (attrname, dn)) - self.report("Values contain a duplicate: [%s]/[%s]!" % (','.join(dump_attr_values(dup_values)), ','.join(dump_attr_values(values)))) + self.report("Values contain a duplicate: [%s]/[%s]!" % + (dump_attr_values(dup_values), dump_attr_values(values))) if not self.confirm_all("Fix duplicates for '%s' from '%s'?" % (attrname, dn), 'fix_all_duplicates'): self.report("Not fixing attribute '%s'" % attrname) return