summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Santiago <santiago@redhat.com>2020-09-15 13:15:17 -0600
committerEd Santiago <santiago@redhat.com>2020-09-15 13:15:17 -0600
commit0f1d9b3bbc13353e3535fe16e7734589b44f1b54 (patch)
tree8a2bc10f3c42e6e3a484e0d8d5fd2b39889e3f78
parentbec96ab03479c5a799be8581bd32c2777ff23ea7 (diff)
downloadpodman-0f1d9b3bbc13353e3535fe16e7734589b44f1b54.tar.gz
podman-0f1d9b3bbc13353e3535fe16e7734589b44f1b54.tar.bz2
podman-0f1d9b3bbc13353e3535fe16e7734589b44f1b54.zip
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 <santiago@redhat.com>
-rw-r--r--cmd/podman/containers/wait.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmd/podman/containers/wait.go b/cmd/podman/containers/wait.go
index 9bb39e978..4bc3d20e2 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)