#
#
# patch "automate.cc"
#  from [0e3aa435aad9e048ed08f99e8ebd06c6c8e2ba9e]
#    to [826195294cf63b15625a947871db926f00619d92]
# 
# patch "tests/automate_inventory_options/__driver__.lua"
#  from [5c539535d0a426d63b22f02b1b656cf4a7a5cffe]
#    to [4fb7dcccf3839bf7767d1488f3ac2a347fb69d09]
#
============================================================
--- automate.cc	0e3aa435aad9e048ed08f99e8ebd06c6c8e2ba9e
+++ automate.cc	826195294cf63b15625a947871db926f00619d92
@@ -710,6 +710,8 @@ namespace
   }
 }
 
+// Set state information for fs_path in 'st', 'ignored', 'unknown', and
+// 'unchanged'.
 static void
 inventory_print_states(app_state & app, file_path const & fs_path,
                        inventory_item const & item, roster_t const & old_roster,
@@ -791,6 +793,7 @@ inventory_print_states(app_state & app, 
   st.push_str_multi(syms::status, states);
 }
 
+// Update state information for item in 'st' and 'unchanged'.
 static void
 inventory_print_changes(inventory_item const & item, roster_t const & old_roster,
                         basic_io::stanza & st, bool & unchanged)
@@ -906,7 +909,7 @@ CMD_AUTOMATE(inventory,  N_("[PATH]...")
   for (inventory_map::const_iterator i = inventory.begin(); i != inventory.end();
        ++i)
     {
-      bool print_this, ignored, unknown, unchanged;
+      bool ignored, unknown, unchanged;
       basic_io::stanza st;
       inventory_item const & item = i->second;
 
@@ -947,21 +950,19 @@ CMD_AUTOMATE(inventory,  N_("[PATH]...")
         }
 
       inventory_print_states(app, i->first, item, old_roster, new_roster, st, ignored, unknown, unchanged);
-      inventory_print_changes(item, old_roster, st, unchanged);
 
-      print_this = true;
-
       if (ignored && app.opts.no_ignored)
-        print_this = false;
+        continue;
 
       if (unknown && app.opts.no_unknown)
-        print_this = false;
+        continue;
 
+      inventory_print_changes(item, old_roster, st, unchanged);
+
       if (unchanged && app.opts.no_unchanged)
-        print_this = false;
+        continue;
 
-      if (print_this)
-        pr.print_stanza(st);
+      pr.print_stanza(st);
     }
 
   output.write(pr.buf.data(), pr.buf.size());
============================================================
--- tests/automate_inventory_options/__driver__.lua	5c539535d0a426d63b22f02b1b656cf4a7a5cffe
+++ tests/automate_inventory_options/__driver__.lua	4fb7dcccf3839bf7767d1488f3ac2a347fb69d09
@@ -1,4 +1,4 @@
--- Test 'automate inventory' options --ignored=false, --unchanged=false, --unknown=false
+-- Test 'automate inventory' options --no-ignored, --no-unchanged, --no-unknown
 
 mtn_setup()