From 6435374d95df0d547f59a77361eed70100c288ef Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Wed, 5 Oct 2022 23:16:03 +0200 Subject: [PATCH] go-selinux: remove fallbacks for go < 1.16 Signed-off-by: Sebastiaan van Stijn --- go-selinux/rchcon.go | 3 --- go-selinux/rchcon_go115.go | 22 ---------------------- 2 files changed, 25 deletions(-) delete mode 100644 go-selinux/rchcon_go115.go diff --git a/go-selinux/rchcon.go b/go-selinux/rchcon.go index 8bff293..185c09d 100644 --- a/go-selinux/rchcon.go +++ b/go-selinux/rchcon.go @@ -1,6 +1,3 @@ -//go:build linux && go1.16 -// +build linux,go1.16 - package selinux import ( diff --git a/go-selinux/rchcon_go115.go b/go-selinux/rchcon_go115.go deleted file mode 100644 index 303cb18..0000000 --- a/go-selinux/rchcon_go115.go +++ /dev/null @@ -1,22 +0,0 @@ -//go:build linux && !go1.16 -// +build linux,!go1.16 - -package selinux - -import ( - "errors" - "os" - - "github.com/opencontainers/selinux/pkg/pwalk" -) - -func rchcon(fpath, label string) error { - return pwalk.Walk(fpath, func(p string, _ os.FileInfo, _ error) error { - e := lSetFileLabel(p, label) - // Walk a file tree can race with removal, so ignore ENOENT. - if errors.Is(e, os.ErrNotExist) { - return nil - } - return e - }) -}