]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
dbcheck: don't try to stringify values list twice
authorDouglas Bagnall <douglas.bagnall@catalyst.net.nz>
Thu, 3 Dec 2020 21:12:08 +0000 (10:12 +1300)
committerNoel Power <npower@samba.org>
Wed, 9 Dec 2020 16:00:39 +0000 (16:00 +0000)
dump_attr_values already turns it into a comma separated list.

Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Noel Power <npower@samba.org>
python/samba/dbchecker.py

index c11de3b3a94f403cee496fcce39c2063991379c4..6d16e88868e1da1389e3700baae1d53b64405f99 100644 (file)
@@ -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