diff options
| author | Matthew Heon <matthew.heon@gmail.com> | 2018-08-21 09:23:28 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-22 11:48:43 +0000 |
| commit | b4420e22fc838fd2bd9712d476656ed6e891d4c8 (patch) | |
| tree | b016d1b1c00506d715e3c6238dad5239b11f5f21 /pkg/hooks/1.0.0/when.go | |
| parent | 149481a57184becf3e9be329d253602654414118 (diff) | |
| download | podman-b4420e22fc838fd2bd9712d476656ed6e891d4c8.tar.gz podman-b4420e22fc838fd2bd9712d476656ed6e891d4c8.tar.bz2 podman-b4420e22fc838fd2bd9712d476656ed6e891d4c8.zip | |
Fix a bug with hook ALWAYS matching with a process
When a non-nil process was used and a hook was set to match
always, this would not actually match. Fix this.
Fixes: #1308
Signed-off-by: Matthew Heon <matthew.heon@gmail.com>
Closes: #1311
Approved by: rhatdan
Diffstat (limited to 'pkg/hooks/1.0.0/when.go')
| -rw-r--r-- | pkg/hooks/1.0.0/when.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/hooks/1.0.0/when.go b/pkg/hooks/1.0.0/when.go index a4870d0fa..a65af048e 100644 --- a/pkg/hooks/1.0.0/when.go +++ b/pkg/hooks/1.0.0/when.go @@ -74,7 +74,7 @@ func (when *When) Match(config *rspec.Spec, annotations map[string]string, hasBi } } - if config.Process != nil { + if config.Process != nil && len(when.Commands) > 0 { if len(config.Process.Args) == 0 { return false, errors.New("process.args must have at least one entry") } |