From e599b5583dd821ed26bdfc01f7f67d4a317b9843 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Sun, 16 Feb 2025 17:26:09 +0900 Subject: fmsg: implement suspend in writer This removes the requirement to call fmsg.Exit on every exit path, and enables direct use of the "log" package. However, fmsg.BeforeExit is still encouraged when possible to catch exit on suspended output. Signed-off-by: Ophestra --- internal/system/tmpfiles.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'internal/system/tmpfiles.go') diff --git a/internal/system/tmpfiles.go b/internal/system/tmpfiles.go index 7dff7c2d..8208e030 100644 --- a/internal/system/tmpfiles.go +++ b/internal/system/tmpfiles.go @@ -44,7 +44,7 @@ func (t *Tmpfile) Type() Enablement { func (t *Tmpfile) apply(_ *I) error { switch t.method { case tmpfileCopy: - fmsg.VPrintln("publishing tmpfile", t) + fmsg.Verbose("publishing tmpfile", t) return fmsg.WrapErrorSuffix(copyFile(t.dst, t.src), fmt.Sprintf("cannot copy tmpfile %q:", t.dst)) default: @@ -54,11 +54,11 @@ func (t *Tmpfile) apply(_ *I) error { func (t *Tmpfile) revert(_ *I, ec *Criteria) error { if ec.hasType(t) { - fmsg.VPrintf("removing tmpfile %q", t.dst) + fmsg.Verbosef("removing tmpfile %q", t.dst) return fmsg.WrapErrorSuffix(os.Remove(t.dst), fmt.Sprintf("cannot remove tmpfile %q:", t.dst)) } else { - fmsg.VPrintf("skipping tmpfile %q", t.dst) + fmsg.Verbosef("skipping tmpfile %q", t.dst) return nil } } -- cgit v1.3.1