add --keep-dist

This commit is contained in:
Mikaël Cluseau
2026-07-17 11:33:07 +02:00
parent 8d56e5c436
commit e58e8f758e
4 changed files with 17 additions and 11 deletions
+3 -3
View File
@@ -11,7 +11,7 @@ func TestMerge(t *testing.T) {
t.Errorf("got %q", v)
}
if v := unparse(genericMerge(parse(`
if v := unparse(genericMerge(parse(`
a: t
b: t
m:
@@ -32,8 +32,8 @@ m:
b1: t
c1: s
` {
t.Errorf("got\n%s", v)
}
t.Errorf("got\n%s", v)
}
}
func parse(s string) (r interface{}) {
+6 -1
View File
@@ -86,7 +86,12 @@ func updateCache() {
existing := []string{}
for _, dir := range []string{distDir, cacheDir} {
cleanDirs := []string{cacheDir}
if !*keepDist {
cleanDirs = append(cleanDirs, distDir)
}
for _, dir := range cleanDirs {
fs.WalkDir(os.DirFS(dir), ".", func(path string, d fs.DirEntry, err error) error {
if err != nil {
log.Printf("update cache: walking %s failed: %v", dir, err)
+2 -1
View File
@@ -8,7 +8,8 @@ import (
)
var (
dataDir = flag.String("data", "/var/lib/direktil", "Data dir")
dataDir = flag.String("data", "/var/lib/direktil", "Data dir")
keepDist = flag.Bool("keep-dist", false, "Keep dist files during cache cleanup (still removes assembled erofs)")
)
func configFilePath() string {