Catalogs: Fix multiple exclusion rules causing entries to be duplicated. Fixes #1281296 [Catalog shows duplicates of all entries](https://bugs.launchpad.net/calibre/+bug/1281296)

Merge branch 'master' of https://github.com/GRiker/calibre
This commit is contained in:
Kovid Goyal 2014-02-19 17:27:21 +05:30
commit dd54ccc0d0

View File

@ -4722,7 +4722,6 @@ class CatalogBuilder(object):
Return: Return:
(list): filtered data_set (list): filtered data_set
""" """
filtered_data_set = [] filtered_data_set = []
exclusion_pairs = [] exclusion_pairs = []
exclusion_set = [] exclusion_set = []
@ -4773,7 +4772,8 @@ class CatalogBuilder(object):
filtered_data_set.remove(record) filtered_data_set.remove(record)
break break
else: else:
filtered_data_set.append(record) if record not in filtered_data_set:
filtered_data_set.append(record)
else: else:
if (record not in filtered_data_set and if (record not in filtered_data_set and
record not in exclusion_set): record not in exclusion_set):