From f17601e4cd3c748e609a2bd76f310e31c4245395 Mon Sep 17 00:00:00 2001
From: Dang Mai <contact@dangmai.net>
Date: Thu, 20 Oct 2016 20:25:38 -0400
Subject: [PATCH] Fix update test failures

---
 beets/library.py     | 2 +-
 beets/ui/commands.py | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/beets/library.py b/beets/library.py
index ef079b6b6..edd79d243 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -767,7 +767,7 @@ class Item(LibModel):
             album = self.get_album()
             if album:
                 album.move_art(copy)
-                album.store()
+                album.store(fields_to_store)
 
         # Prune vacated directory.
         if not copy:
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index 88b5de728..823e99cfa 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -1086,9 +1086,6 @@ def update_items(lib, query, album, move, pretend, fields):
     reflect the item's embedded tags.
     """
     with lib.transaction():
-        if fields is None:
-            fields = library.Item._media_fields
-
         items, _ = _do_query(lib, query, album)
 
         # Walk through the items and pick up their changes.
@@ -1127,8 +1124,9 @@ def update_items(lib, query, album, move, pretend, fields):
                     item._dirty.discard(u'albumartist')
 
             # Check for and display changes.
-            changed = ui.show_model_changes(item,
-                                            fields=fields)
+            changed = ui.show_model_changes(
+                item,
+                fields=fields or library.Item._media_fields)
 
             # Save changes.
             if not pretend: