roll display_dicts result into ItemStatus so it’s available for `bw v…

…erify` fixes #376
bundlewrap · Dec 31, 2017 · 6b0ce58 · 6b0ce58
1 parent c5bfb35
commit 6b0ce58
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/bundlewrap/items/__init__.py b/bundlewrap/items/__init__.py
@@ -55,7 +55,7 @@ class ItemStatus(object):
     fixing and what's broken.
     """
 
-    def __init__(self, cdict, sdict):
+    def __init__(self, cdict, sdict, display_dicts):
         self.cdict = cdict
         self.sdict = sdict
         self.keys_to_fix = []
@@ -64,6 +64,12 @@ def __init__(self, cdict, sdict):
         if not self.must_be_deleted and not self.must_be_created:
             self.keys_to_fix = diff_keys(cdict, sdict)
 
+        self.display_cdict, self.display_sdict, self.display_keys_to_fix = display_dicts(
+            copy(cdict),
+            copy(sdict),
+            copy(self.keys_to_fix),
+        )
+
     def __repr__(self):
         return "<ItemStatus correct:{}>".format(self.correct)
 
@@ -497,12 +503,11 @@ def apply(
                 elif status_before.must_be_deleted:
                     question_text = _("Found on node. Will be removed.")
                 else:
-                    cdict, sdict, display_keys_to_fix = self.display_dicts(
-                        copy(self.cached_cdict),
-                        copy(status_before.sdict),
-                        copy(keys_to_fix),
+                    question_text = self.ask(
+                        status_before.display_cdict,
+                        status_before.display_sdict,
+                        status_before.display_keys_to_fix,
                     )
-                    question_text = self.ask(cdict, sdict, display_keys_to_fix)
                 if self.comment:
                     question_text += format_comment(self.comment)
                 question = wrap_question(
@@ -643,7 +648,7 @@ def get_status(self, cached=True):
         )):
             if not cached:
                 del self._cache['cached_sdict']
-            return ItemStatus(self.cached_cdict, self.cached_sdict)
+            return ItemStatus(self.cached_cdict, self.cached_sdict, self.display_dicts)
 
     def hash(self):
         return hash_statedict(self.cached_cdict)

diff --git a/bundlewrap/node.py b/bundlewrap/node.py
@@ -838,7 +838,7 @@ def handle_result(task_id, return_value, duration):
             elif item_status.must_be_deleted:
                 changes_text = _("remove")
             else:
-                changes_text = ", ".join(sorted(item_status.keys_to_fix))
+                changes_text = ", ".join(sorted(item_status.display_keys_to_fix))
             io.stderr("{x} {node}  {bundle}  {item} ({changes})".format(
                 bundle=bold(bundle_name),
                 changes=changes_text,