summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Command/Schedule.hs3
-rw-r--r--Command/Wanted.hs3
-rw-r--r--debian/changelog1
3 files changed, 7 insertions, 0 deletions
diff --git a/Command/Schedule.hs b/Command/Schedule.hs
index 35f144c75..db654f291 100644
--- a/Command/Schedule.hs
+++ b/Command/Schedule.hs
@@ -8,10 +8,12 @@
module Command.Schedule where
import Common.Annex
+import qualified Annex
import Command
import qualified Remote
import Logs.Schedule
import Types.ScheduledActivity
+import Types.Messages
import qualified Data.Set as S
@@ -37,6 +39,7 @@ start = parse
performGet :: UUID -> CommandPerform
performGet uuid = do
+ Annex.setOutput QuietOutput
s <- scheduleGet uuid
liftIO $ putStrLn $ intercalate "; " $
map fromScheduledActivity $ S.toList s
diff --git a/Command/Wanted.hs b/Command/Wanted.hs
index a7b4a3d9e..9ea0c211f 100644
--- a/Command/Wanted.hs
+++ b/Command/Wanted.hs
@@ -8,9 +8,11 @@
module Command.Wanted where
import Common.Annex
+import qualified Annex
import Command
import qualified Remote
import Logs.PreferredContent
+import Types.Messages
import qualified Data.Map as M
@@ -36,6 +38,7 @@ start = parse
performGet :: UUID -> CommandPerform
performGet uuid = do
+ Annex.setOutput QuietOutput
m <- preferredContentMapRaw
liftIO $ putStrLn $ fromMaybe "" $ M.lookup uuid m
next $ return True
diff --git a/debian/changelog b/debian/changelog
index ba7d5686f..6f9acd234 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ git-annex (5.20131231) UNRELEASED; urgency=medium
and keeps crashing when restarted.
* Assistant: Remove stale MERGE_HEAD files in lockfile cleanup.
* 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