From 0f1d9b3bbc13353e3535fe16e7734589b44f1b54 Mon Sep 17 00:00:00 2001 From: Ed Santiago Date: Tue, 15 Sep 2020 13:15:17 -0600 Subject: [PATCH] Fix CI breakage due to PR collision PR #7633 disallowed "-l" (--latest) with container args. PR #7630 made changes to the "podman wait" command. The error message it issues is inconsistent (and incompatible) with the one required by the new BATS --help test. Fix that. This is entirely my fault. I was aware of #7630, and I was careful to check the output message format, but I was not careful enough (I trusted my eyes, not my code). Signed-off-by: Ed Santiago --- cmd/podman/containers/wait.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go index 9bb39e978851..4bc3d20e2f76 100644 --- a/cmd/podman/containers/wait.go +++ b/cmd/podman/containers/wait.go @@ -78,7 +78,7 @@ func wait(cmd *cobra.Command, args []string) error { return errors.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath()) } if waitOptions.Latest && len(args) > 0 { - return errors.New("--latest and containers are not allowed") + return errors.New("--latest and containers cannot be used together") } waitOptions.Condition, err = define.StringToContainerStatus(waitCondition)