diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-11-28 04:43:36 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-28 04:43:36 -0800 |
| commit | 6688e9bc1457f1b5b96e55b01776bdb3f87bb535 (patch) | |
| tree | 1a60e44aa14143223fcdf24caddb21a004bf7c7b | |
| parent | dd315cc043a1eda3bec1de6033c043943a3c429e (diff) | |
| parent | c4a592b632957513cae2a728a1b9f665827595d8 (diff) | |
| download | podman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.tar.gz podman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.tar.bz2 podman-6688e9bc1457f1b5b96e55b01776bdb3f87bb535.zip | |
Merge pull request #1837 from giuseppe/vndr-selinux
vendor: update selinux
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/opencontainers/selinux/go-selinux/selinux_linux.go | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf index 0c05e792c..f9fccfdfb 100644 --- a/vendor.conf +++ b/vendor.conf @@ -51,7 +51,7 @@ github.com/opencontainers/image-spec v1.0.0 github.com/opencontainers/runc b4e2ecb452d9ee4381137cc0a7e6715b96bed6de github.com/opencontainers/runtime-spec d810dbc60d8c5aeeb3d054bd1132fab2121968ce github.com/opencontainers/runtime-tools master -github.com/opencontainers/selinux 36a9bc45a08c85f2c52bd9eb32e20267876773bd +github.com/opencontainers/selinux 6ba084dd09db3dfe49a839bab0bbe97fd9274d80 github.com/ostreedev/ostree-go master github.com/pkg/errors v0.8.0 github.com/pmezard/go-difflib 792786c7400a136282c1664665ae0a8db921c6c2 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 { |