refractor: move CopyTo

Will be replaced by os.CopyFS with go 1.23
This commit is contained in:
Alexandre Pujol 2024-10-12 15:40:17 +01:00
parent 982c2c66aa
commit e90ccd214c
No known key found for this signature in database
GPG key ID: C5469996F0DF68EC
5 changed files with 9 additions and 53 deletions

View file

@ -7,8 +7,8 @@ package prepare
import (
"fmt"
"github.com/roddhjav/apparmor.d/pkg/paths"
"github.com/roddhjav/apparmor.d/pkg/prebuild"
"github.com/roddhjav/apparmor.d/pkg/util"
)
type Configure struct {
@ -36,7 +36,7 @@ func (p Configure) Apply() ([]string, error) {
}
if prebuild.ABI == 3 {
if err := util.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil {
if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil {
return res, err
}
}
@ -47,7 +47,7 @@ func (p Configure) Apply() ([]string, error) {
}
// Copy Debian specific abstractions
if err := util.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil {
if err := paths.CopyTo(prebuild.DistDir.Join("ubuntu"), prebuild.RootApparmord); err != nil {
return res, err
}