--- a/src/client.py Fri Aug 26 19:23:52 2016 +1000
+++ b/src/client.py Mon Aug 22 10:47:25 2016 -0700
@@ -3309,8 +3309,8 @@
usage(_("no valid action types specified"),
cmd=subcommand)
elif invalid_atype:
- msg(_("""\
-WARNING: invalid action types specified:{0}
+ emsg(_("""\
+WARNING: invalid action types specified: {0}
""".format(",".join(invalid_atype))))
check_attrs(attrs, subcommand)
--- a/src/tests/cli/t_pkg_contents.py Fri Aug 26 19:23:52 2016 +1000
+++ b/src/tests/cli/t_pkg_contents.py Mon Aug 22 10:47:25 2016 -0700
@@ -114,8 +114,9 @@
self.assertTrue("LICENSE" in self.output and "NAME" in self.output
and "VALUE" in self.output)
self.pkg("contents -t falseaction", exit=2)
- self.pkg("contents -t falseaction,file", exit=0)
+ self.pkg("contents -t falseaction,file")
self.assertTrue("PATH" in self.output)
+ self.assertTrue("falseaction" in self.errout)
def test_contents_empty_image(self):
"""local pkg contents should fail in an empty image; remote