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

Fix reversion in lookupkey, contentlocation, and examinekey which caused them to sometimes output side messages.

Browse source
This commit is contained in:
Joey Hess 2016-01-29 13:20:24 -04:00
parent 66a24e0f36
commit 9a4af2324e
Failed to extract signature
6 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/ContentLocation.hs
View file

@ -11,7 +11,7 @@ import Command
import Annex.Content import Annex.Content
cmd :: Command cmd :: Command
cmd = noCommit $ cmd = noCommit $ noMessages $
command "contentlocation" SectionPlumbing command "contentlocation" SectionPlumbing
"looks up content for a key" "looks up content for a key"
(paramRepeating paramKey) (paramRepeating paramKey)

2
Command/ExamineKey.hs
View file

@ -12,7 +12,7 @@ import qualified Utility.Format
import Command.Find (parseFormatOption, showFormatted, keyVars) import Command.Find (parseFormatOption, showFormatted, keyVars)
cmd :: Command cmd :: Command
cmd = noCommit $ withGlobalOptions [jsonOption] $ cmd = noCommit $ noMessages $ withGlobalOptions [jsonOption] $
command "examinekey" SectionPlumbing command "examinekey" SectionPlumbing
"prints information from a key" "prints information from a key"
(paramRepeating paramKey) (paramRepeating paramKey)

2
Command/LookupKey.hs
View file

@ -11,7 +11,7 @@ import Command
import Annex.CatFile import Annex.CatFile
cmd :: Command cmd :: Command
cmd = notBareRepo $ noCommit $ cmd = notBareRepo $ noCommit $ noMessages $
command "lookupkey" SectionPlumbing command "lookupkey" SectionPlumbing
"looks up key used for file" "looks up key used for file"
(paramRepeating paramFile) (paramRepeating paramFile)

2
debian/changelog vendored
View file

@ -2,6 +2,8 @@ git-annex (6.20160127) UNRELEASED; urgency=medium
* annex.addsmallfiles: New option controlling what is done when * annex.addsmallfiles: New option controlling what is done when
adding files not matching annex.largefiles. 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 -- Joey Hess <id@joeyh.name> Thu, 28 Jan 2016 13:53:09 -0400

2
doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout.mdwn
View file

@ -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 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]] [[!meta author=yoh]]
> [[fixed|done]] --[[Joey]]

10
doc/bugs/lookupkey_started_to_spit_out___34__debug__34___messages_to_stdout/comment_1_740035f35d149f453e66c3ed03d525b5._comment Normal file
View file

@ -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.
"""]]