Write into a marked block of a text file instead of over it, so a shared hosts file keeps every line that is not the mesh's (hq issue 128)
This commit is contained in:
@@ -669,6 +669,9 @@ func applyAccess(r *declaration.Access) (Outcome, error) {
|
||||
// keepFound, when not nil, is where the original of a file this host has no record of is kept
|
||||
// before it is written over (novox/hq ADR 0100): once, never overwritten, and named in the outcome.
|
||||
func applyFile(r *declaration.File, previous store.Applied, unseal Unseal, keepFound Keep) (Outcome, error) {
|
||||
if r.Into == declaration.IntoBlock {
|
||||
return applyBlock(r, previous)
|
||||
}
|
||||
if r.Into != "" {
|
||||
return applyInto(r, previous)
|
||||
}
|
||||
@@ -1049,6 +1052,9 @@ func remove(ctx context.Context, sys system.System, a store.Applied, run Runner)
|
||||
return "removed", "no longer declared, and empty", nil
|
||||
|
||||
case declaration.TypeFile:
|
||||
if a.Into != nil && a.Into.Format == declaration.IntoBlock {
|
||||
return removeBlock(a)
|
||||
}
|
||||
if a.Into != nil {
|
||||
return removeInto(a)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user