Fix regression in 0.8.26 that broke disabling the update of particular fields during a bulk metadata download. Fixes #889696 (Metadata Download (bulk) broken in 8.26.)

This commit is contained in:
Kovid Goyal 2011-11-13 11:49:49 +05:30
parent 8673853c09
commit 03c6e0bb02

View File

@ -131,8 +131,9 @@ def get_job_details(job):
def merge_result(oldmi, newmi, ensure_fields=None):
dummy = Metadata(_('Unknown'))
for f in msprefs['ignore_fields']:
if ':' not in f and (ensure_fields and f not in ensure_fields):
setattr(newmi, f, getattr(dummy, f))
if ':' in f or (ensure_fields and f in ensure_fields):
continue
setattr(newmi, f, getattr(dummy, f))
fields = set()
for plugin in metadata_plugins(['identify']):
fields |= plugin.touched_fields