container/check: move absolute pathname
All checks were successful
Test / Create distribution (push) Successful in 34s
Test / Hpkg (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 4m26s
Test / Hakurei (race detector) (push) Successful in 5m19s
Test / Sandbox (push) Successful in 1m28s
Test / Hakurei (push) Successful in 2m16s
Test / Flake checks (push) Successful in 1m37s
All checks were successful
Test / Create distribution (push) Successful in 34s
Test / Hpkg (push) Successful in 4m3s
Test / Sandbox (race detector) (push) Successful in 4m26s
Test / Hakurei (race detector) (push) Successful in 5m19s
Test / Sandbox (push) Successful in 1m28s
Test / Hakurei (push) Successful in 2m16s
Test / Flake checks (push) Successful in 1m37s
This allows use of absolute pathname values without importing container. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -4,7 +4,7 @@ import (
|
||||
"encoding/gob"
|
||||
"path"
|
||||
|
||||
"hakurei.app/container"
|
||||
"hakurei.app/container/check"
|
||||
)
|
||||
|
||||
func init() { gob.Register(new(FSLink)) }
|
||||
@@ -15,7 +15,7 @@ const FilesystemLink = "link"
|
||||
// FSLink represents a symlink in the container filesystem.
|
||||
type FSLink struct {
|
||||
// link path in container
|
||||
Target *container.Absolute `json:"dst"`
|
||||
Target *check.Absolute `json:"dst"`
|
||||
// linkname the symlink points to
|
||||
Linkname string `json:"linkname"`
|
||||
// whether to dereference linkname before creating the link
|
||||
@@ -29,14 +29,14 @@ func (l *FSLink) Valid() bool {
|
||||
return !l.Dereference || path.IsAbs(l.Linkname)
|
||||
}
|
||||
|
||||
func (l *FSLink) Path() *container.Absolute {
|
||||
func (l *FSLink) Path() *check.Absolute {
|
||||
if !l.Valid() {
|
||||
return nil
|
||||
}
|
||||
return l.Target
|
||||
}
|
||||
|
||||
func (l *FSLink) Host() []*container.Absolute { return nil }
|
||||
func (l *FSLink) Host() []*check.Absolute { return nil }
|
||||
|
||||
func (l *FSLink) Apply(z *ApplyState) {
|
||||
if !l.Valid() {
|
||||
|
||||
Reference in New Issue
Block a user