fix conflict issue

This commit is contained in:
bkfox
2016-05-26 01:56:09 +02:00
parent a989e53da4
commit 7402fc49b6
7 changed files with 32 additions and 27 deletions

View File

@ -38,7 +38,7 @@ class Actions:
Return the number of conflicts
"""
conflicts = item.get_conflicts()
conflicts = list(item.get_conflicts())
for i, conflict in enumerate(conflicts):
if conflict.program == item.program:
item.do_not_save = True
@ -74,6 +74,7 @@ class Actions:
if manual:
Diffusion.objects.bulk_create(items)
else:
print('items: ', len(items))
for item in items:
count[1] += cl.__check_conflicts(item, saved_items)
if hasattr(item, 'do_not_save'):