Skip to content

Commit

Permalink
Fix CI breakage due to PR collision
Browse files Browse the repository at this point in the history
PR containers#7633 disallowed "-l" (--latest) with container args.

PR containers#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 containers#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 <santiago@redhat.com>
  • Loading branch information
edsantiago committed Sep 15, 2020
1 parent bec96ab commit 0f1d9b3
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cmd/podman/containers/wait.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0f1d9b3

Please sign in to comment.