diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-08-01 13:30:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-08-01 13:30:48 -0400 |
| commit | 63be08678829f5b83c39f2f6a9d44cc920b7892f (patch) | |
| tree | 511333256e8928bc4efd1b994714ce27cac8f101 | |
| parent | 15f292d177ee96f5a1d384ce50f5246e3f7ea630 (diff) | |
Improve PROPELLOR_TRACE output so serialized trace values always come on their own line, not mixed with title setting.
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | src/Propellor/Message.hs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e314a88c..6274bc6f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ propellor (4.7.4) UNRELEASED; urgency=medium * Set GPG_TTY when run at a terminal, so that gpg can do password prompting despite being connected by pipes to propellor (or git). * Rsync: Make rsync display less verbose. + * Improve PROPELLOR_TRACE output so serialized trace values always + come on their own line, not mixed with title setting. -- Joey Hess <id@joeyh.name> Sat, 29 Jul 2017 20:02:32 -0400 diff --git a/src/Propellor/Message.hs b/src/Propellor/Message.hs index 51d9babb..0f42e417 100644 --- a/src/Propellor/Message.hs +++ b/src/Propellor/Message.hs @@ -96,9 +96,9 @@ actionMessageOn = actionMessage' . Just actionMessage' :: (MonadIO m, ActionResult r, ToResult r) => Maybe HostName -> Desc -> m r -> m r actionMessage' mhn desc a = do + liftIO $ trace $ ActionStart mhn desc liftIO $ outputConcurrent =<< whenConsole (setTitleCode $ "propellor: " ++ desc) - liftIO $ trace $ ActionStart mhn desc r <- a |