summaryrefslogtreecommitdiff
path: root/vendor
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2018-11-28 04:43:36 -0800
committerGitHub <noreply@github.com>2018-11-28 04:43:36 -0800
commit6688e9bc1457f1b5b96e55b01776bdb3f87bb535 (patch)
tree1a60e44aa14143223fcdf24caddb21a004bf7c7b /vendor
parentdd315cc043a1eda3bec1de6033c043943a3c429e (diff)
parentc4a592b632957513cae2a728a1b9f665827595d8 (diff)
downloadpodman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.tar.gz
podman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.tar.bz2
podman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.zip
Merge pull request #1837 from giuseppe/vndr-selinux
vendor: update selinux
Diffstat (limited to 'vendor')
-rw-r--r--vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go6
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
index 2cd54eac1..bbaa1e0d7 100644
--- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
+++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go
@@ -687,7 +687,11 @@ func Chcon(fpath string, label string, recurse bool) error {
return err
}
callback := func(p string, info os.FileInfo, err error) error {
- return SetFileLabel(p, label)
+ e := SetFileLabel(p, label)
+ if os.IsNotExist(e) {
+ return nil
+ }
+ return e
}
if recurse {