Merge pull request #4016 from norio-nomura/do-no-skip-template-on--keep-referred

jandubois · web-flow · commit ead2a7bf9a66 · 2025-09-09T22:15:40.000-07:00
`limactl prune --keep-referred`: Do not skip template on failing `driverutil.ResolveVMType()`
diff --git a/cmd/limactl/prune.go b/cmd/limactl/prune.go
@@ -105,8 +105,7 @@ func knownLocations(ctx context.Context) (map[string]limatype.File, error) {
 			return nil, err
 		}
 		if err := driverutil.ResolveVMType(ctx, y, t.Name); err != nil {
-			logrus.Warnf("failed to resolve vm for %q: %v", t.Name, err)
-			continue
+			logrus.Warnf("failed to resolve vmType for %q: %v", t.Name, err)
 		}
 		maps.Copy(locations, locationsFromLimaYAML(y))
 	}

Original file line number	Diff line number	Diff line change
`@@ -105,8 +105,7 @@ func knownLocations(ctx context.Context) (map[string]limatype.File, error) {`
`105`	`105`	`return nil, err`
`106`	`106`	`}`
`107`	`107`	`if err := driverutil.ResolveVMType(ctx, y, t.Name); err != nil {`
`108`		`- logrus.Warnf("failed to resolve vm for %q: %v", t.Name, err)`
`109`		`- continue`
	`108`	`+ logrus.Warnf("failed to resolve vmType for %q: %v", t.Name, err)`
`110`	`109`	`}`
`111`	`110`	`maps.Copy(locations, locationsFromLimaYAML(y))`
`112`	`111`	`}`