diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2018-06-27 05:29:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-27 05:29:18 -0400 |
| commit | 330bbe29bb44e74deb6d0dec5c06a9f2fa28199e (patch) | |
| tree | 8f9565ccdf6202d413df87589453801910332717 | |
| parent | 60427ab3d26bbe5a5ab00c4e7b550f111b4f72e5 (diff) | |
| parent | 3a471c716155d807e5218e8fb5934230005c913c (diff) | |
| download | podman-330bbe29bb44e74deb6d0dec5c06a9f2fa28199e.tar.gz podman-330bbe29bb44e74deb6d0dec5c06a9f2fa28199e.tar.bz2 podman-330bbe29bb44e74deb6d0dec5c06a9f2fa28199e.zip | |
Merge pull request #1003 from rhatdan/vendor
Vendor in go-selinux again
| -rw-r--r-- | vendor.conf | 2 | ||||
| -rw-r--r-- | vendor/github.com/opencontainers/selinux/go-selinux/selinux.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/vendor.conf b/vendor.conf index d9766a4b4..1121f3b50 100644 --- a/vendor.conf +++ b/vendor.conf @@ -49,7 +49,7 @@ github.com/opencontainers/image-spec v1.0.0 github.com/opencontainers/runc 6e15bc3f92fd4c58b3285e8f27eaeb6b22d62920 github.com/opencontainers/runtime-spec v1.0.0 github.com/opencontainers/runtime-tools 625e2322645b151a7cbb93a8b42920933e72167f -github.com/opencontainers/selinux 55cb7f16be130730b52cb3bdcc9351efa231130a +github.com/opencontainers/selinux 3b2399ec5682aea5c9160d44fa53387d7e65ccf5 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.go b/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go index 6993cb388..10aa85165 100644 --- a/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go +++ b/vendor/github.com/opencontainers/selinux/go-selinux/selinux.go @@ -53,7 +53,7 @@ FSCreateLabel returns the default label the kernel which the kernel is using for file system objects created by this task. "" indicates default. */ func FSCreateLabel() (string, error) { - return nil + return "", nil } // CurrentLabel returns the SELinux label of the current process thread, or an error. |