diff options
6 files changed, 17 insertions, 3 deletions
diff --git a/Command/ContentLocation.hs b/Command/ContentLocation.hs index 7cd6c2995..5b2acb6a5 100644 --- a/Command/ContentLocation.hs +++ b/Command/ContentLocation.hs @@ -11,7 +11,7 @@ import Command import Annex.Content cmd :: Command -cmd = noCommit $ +cmd = noCommit $ noMessages $ command "contentlocation" SectionPlumbing "looks up content for a key" (paramRepeating paramKey) diff --git a/Command/ExamineKey.hs b/Command/ExamineKey.hs index 1ca1f9fb5..5f67587a8 100644 --- a/Command/ExamineKey.hs +++ b/Command/ExamineKey.hs @@ -12,7 +12,7 @@ import qualified Utility.Format import Command.Find (parseFormatOption, showFormatted, keyVars) cmd :: Command -cmd = noCommit $ withGlobalOptions [jsonOption] $ +cmd = noCommit $ noMessages $ withGlobalOptions [jsonOption] $ command "examinekey" SectionPlumbing "prints information from a key" (paramRepeating paramKey) diff --git a/Command/LookupKey.hs b/Command/LookupKey.hs index 1f21a582e..609fe562e 100644 --- a/Command/LookupKey.hs +++ b/Command/LookupKey.hs @@ -11,7 +11,7 @@ import Command import Annex.CatFile cmd :: Command -cmd = notBareRepo $ noCommit $ +cmd = notBareRepo $ noCommit $ noMessages $ command "lookupkey" SectionPlumbing "looks up key used for file" (paramRepeating paramFile) diff --git a/debian/changelog b/debian/changelog index 705fb0f52..962c76d22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ git-annex (6.20160127) UNRELEASED; urgency=medium * annex.addsmallfiles: New option controlling what is done when adding files not matching annex.largefiles. + * Fix reversion in lookupkey, contentlocation, and examinekey which + caused them to sometimes output side messages. -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400 diff --git a/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout.mdwn b/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout.mdwn index 5f3d0a6b1..265005c9e 100644 --- a/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout.mdwn +++ b/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout.mdwn @@ -37,3 +37,5 @@ SHA256E-s4--181210f8f9c779c26da1d9b2075bde0127302ee0e3fca38c9a83f5b1dd8e5d3b.dat I guess I will just skip all lines starting with ( for now but thought to let you know about such changed behavior which might complicate pipelining etc [[!meta author=yoh]] + +> [[fixed|done]] --[[Joey]] diff --git a/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout/comment_1_740035f35d149f453e66c3ed03d525b5._comment b/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout/comment_1_740035f35d149f453e66c3ed03d525b5._comment new file mode 100644 index 000000000..054c6919c --- /dev/null +++ b/doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout/comment_1_740035f35d149f453e66c3ed03d525b5._comment @@ -0,0 +1,10 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 1""" + date="2016-01-29T17:16:57Z" + content=""" +Argh, that was a dumb mistake. I've fixed this in git. + +A better workaround would be to use --quiet which will silence all messages +except the main command output. +"""]] |