diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-11-28 14:40:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-11-28 15:14:16 -0400 |
| commit | 699611cde5cda8b2f2d83a6d6ac9c1e575b74f51 (patch) | |
| tree | b502247490779aca8068684a3be42791050eff7b /Command/Expire.hs | |
| parent | bf5de3a6f3d50028f7ac47c6cde759a6f5110b08 (diff) | |
showStart variant for when there's no worktree file
Clean up some uses of showStart with "" for the file,
or in some cases, a non-filename description string. That would
generate bad json, although none of the commands doing that
supported --json.
Using "" for the file resulted in output like "foo rest";
now the extra space is eliminated.
This commit was sponsored by Fernando Jimenez on Patreon.
Diffstat (limited to 'Command/Expire.hs')
| -rw-r--r-- | Command/Expire.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Expire.hs b/Command/Expire.hs index 551742304..28f90dfb5 100644 --- a/Command/Expire.hs +++ b/Command/Expire.hs @@ -59,12 +59,12 @@ start :: Expire -> Bool -> Log Activity -> M.Map UUID String -> UUID -> CommandS start (Expire expire) noact actlog descs u = case lastact of Just ent | notexpired ent -> checktrust (== DeadTrusted) $ do - showStart "unexpire" desc + showStart' "unexpire" (Just desc) showNote =<< whenactive unless noact $ trustSet u SemiTrusted _ -> checktrust (/= DeadTrusted) $ do - showStart "expire" desc + showStart' "expire" (Just desc) showNote =<< whenactive unless noact $ trustSet u DeadTrusted |