diff --git a/internal/pkg/clean.go b/internal/pkg/clean.go index efeb40de..f07706cf 100644 --- a/internal/pkg/clean.go +++ b/internal/pkg/clean.go @@ -73,7 +73,10 @@ func (c *Cache) Clean(dry, inputs bool, keep ...Artifact) ( continue } - c.msg.Verbosef("arranging for destruction of %s...", name) + c.msg.Verbosef( + "arranging for destruction of %s%s%s...", + c.sgrIdent, name, c.sgrRes, + ) idents = append(idents, identPair{id, name}) } @@ -102,7 +105,10 @@ func (c *Cache) Clean(dry, inputs bool, keep ...Artifact) ( if err = c.parent.Err(); err != nil { return destroyedIdents, destroyedChecksums, err } - c.msg.Verbosef("destroying checksum %s...", name) + c.msg.Verbosef( + "destroying checksum %s%s%s...", + c.sgrIdent, name, c.sgrRes, + ) if !dry { if err = errors.Join(removeAll(c.base.Append( dirChecksum, @@ -130,7 +136,10 @@ func (c *Cache) Clean(dry, inputs bool, keep ...Artifact) ( continue } - c.msg.Verbosef("destroying substitute %s...", name) + c.msg.Verbosef( + "destroying substitute %s%s%s...", + c.sgrIdent, name, c.sgrRes, + ) if !dry { if err = os.Remove(c.base.Append( dirStatus, diff --git a/internal/pkg/ir.go b/internal/pkg/ir.go index d5e6bbdb..d9f984a7 100644 --- a/internal/pkg/ir.go +++ b/internal/pkg/ir.go @@ -823,8 +823,8 @@ func (d *IRDecoder) decode() (a Artifact, err error) { d.ident[id] = a } else { d.c.msg.Verbosef( - "artifact %s appeared more than once in IR stream", - Encode(id.Value()), + "artifact %s%s%s appeared more than once in IR stream", + d.c.sgrIdent, Encode(id.Value()), d.c.sgrRes, ) } diff --git a/internal/pkg/pkg.go b/internal/pkg/pkg.go index 21e5b8d7..f1a677b1 100644 --- a/internal/pkg/pkg.go +++ b/internal/pkg/pkg.go @@ -1137,7 +1137,10 @@ func (c *Cache) Scrub(checks int) error { } else if !ce.check(ent, want) { wg.Go(func() { condemn(ent) }) } else { - c.msg.Verbosef("%s is consistent", ent.Name()) + c.msg.Verbosef( + "%s%s%s is consistent", + c.sgrIdent, ent.Name(), c.sgrRes, + ) } p.Put(want) wg.Done() diff --git a/internal/pkg/tar.go b/internal/pkg/tar.go index 60b23e81..9a8c4b76 100644 --- a/internal/pkg/tar.go +++ b/internal/pkg/tar.go @@ -174,8 +174,8 @@ func (a *tarArtifact) Cure(t *TContext) (err error) { case tar.TypeChar: t.GetMessage().Verbosef( - "skipping character device %d, %d %q", - header.Devmajor, header.Devminor, header.Name, + "%sskipping character device %d, %d %q%s", + t.cache.sgrWarn, header.Devmajor, header.Devminor, header.Name, t.cache.sgrRes, ) continue