From 03c6e0bb025870c7f62bfd75d9e503d29848b4b0 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 13 Nov 2011 11:49:49 +0530 Subject: [PATCH] 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.) --- src/calibre/gui2/metadata/bulk_download.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/metadata/bulk_download.py b/src/calibre/gui2/metadata/bulk_download.py index 182881f02d..976dfad2bb 100644 --- a/src/calibre/gui2/metadata/bulk_download.py +++ b/src/calibre/gui2/metadata/bulk_download.py @@ -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