opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-24 11:28:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7644 from edsantiago/bats

Browse Source 
Fix CI breakage due to PR collision
This commit is contained in:
OpenShift Merge Robot
2020-09-15 23:07:28 +02:00
committed by GitHub
parent bec96ab034 0f1d9b3bbc
commit 2eb3339343
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/podman/containers/wait.go
View File

@ -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()) return errors.Errorf("%q requires a name, id, or the \"--latest\" flag", cmd.CommandPath())
} }
if waitOptions.Latest && len(args) > 0 { 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) waitOptions.Condition, err = define.StringToContainerStatus(waitCondition)