mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

wanted, schedule: Avoid printing "ok" after requested value.

Browse source
This commit is contained in:
Joey Hess 2014-01-03 14:51:32 -04:00
parent 9f1fd35536
commit 3560fb411d
3 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Command/Schedule.hs
View file

@ -8,10 +8,12 @@
module Command.Schedule where module Command.Schedule where
import Common.Annex import Common.Annex
import qualified Annex
import Command import Command
import qualified Remote import qualified Remote
import Logs.Schedule import Logs.Schedule
import Types.ScheduledActivity import Types.ScheduledActivity
import Types.Messages
import qualified Data.Set as S import qualified Data.Set as S
@ -37,6 +39,7 @@ start = parse
performGet :: UUID -> CommandPerform performGet :: UUID -> CommandPerform
performGet uuid = do performGet uuid = do
Annex.setOutput QuietOutput
s <- scheduleGet uuid s <- scheduleGet uuid
liftIO $ putStrLn $ intercalate "; " $ liftIO $ putStrLn $ intercalate "; " $
map fromScheduledActivity $ S.toList s map fromScheduledActivity $ S.toList s

3
Command/Wanted.hs
View file

@ -8,9 +8,11 @@
module Command.Wanted where module Command.Wanted where
import Common.Annex import Common.Annex
import qualified Annex
import Command import Command
import qualified Remote import qualified Remote
import Logs.PreferredContent import Logs.PreferredContent
import Types.Messages
import qualified Data.Map as M import qualified Data.Map as M
@ -36,6 +38,7 @@ start = parse
performGet :: UUID -> CommandPerform performGet :: UUID -> CommandPerform
performGet uuid = do performGet uuid = do
Annex.setOutput QuietOutput
m <- preferredContentMapRaw m <- preferredContentMapRaw
liftIO $ putStrLn $ fromMaybe "" $ M.lookup uuid m liftIO $ putStrLn $ fromMaybe "" $ M.lookup uuid m
next $ return True next $ return True

1
debian/changelog vendored
View file

@ -10,6 +10,7 @@ git-annex (5.20131231) UNRELEASED; urgency=medium
and keeps crashing when restarted. and keeps crashing when restarted.
* Assistant: Remove stale MERGE_HEAD files in lockfile cleanup. * Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.
* Remotes can now be made read-only, by setting remote.<name>.annex-readonly * Remotes can now be made read-only, by setting remote.<name>.annex-readonly
* wanted, schedule: Avoid printing "ok" after requested value.
-- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400 -- Joey Hess <joeyh@debian.org> Tue, 31 Dec 2013 13:41:18 -0400