summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-08-13 14:55:43 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-08-13 15:05:42 -0400
commit6aa4fbb0ea769fe68e5921d7ee56bbc3b66ddc8b (patch)
tree90061fdf59d8ff8719494de1a20cd1fdc211b7db
parentce64c1403df0e4ca75be50e4a835cc0889b0c8ac (diff)
downloadpodman-6aa4fbb0ea769fe68e5921d7ee56bbc3b66ddc8b.tar.gz
podman-6aa4fbb0ea769fe68e5921d7ee56bbc3b66ddc8b.tar.bz2
podman-6aa4fbb0ea769fe68e5921d7ee56bbc3b66ddc8b.zip
Running Podman with a nonexistent hooks dir is nonfatal
Even explicitly defined hooks directories may not exist under some circumstances. It's not worth a hard-fail if we hit an ENOENT in these cases. Signed-off-by: Matthew Heon <matthew.heon@pm.me>
-rw-r--r--pkg/hooks/hooks.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/hooks/hooks.go b/pkg/hooks/hooks.go
index b962ffa5c..0d26bf4af 100644
--- a/pkg/hooks/hooks.go
+++ b/pkg/hooks/hooks.go
@@ -4,6 +4,7 @@ package hooks
import (
"context"
"fmt"
+ "os"
"sort"
"strings"
"sync"
@@ -56,7 +57,7 @@ func New(ctx context.Context, directories []string, extensionStages []string) (m
for _, dir := range directories {
err = ReadDir(dir, manager.extensionStages, manager.hooks)
- if err != nil {
+ if err != nil && !os.IsNotExist(err) {
return nil, err
}
}