Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2013-05-02 18:30:15 -04:00
commit e24490b162
2 changed files with 47 additions and 0 deletions

View file

@ -0,0 +1,31 @@
### Please describe the problem.
repos of group smallarchive have started trying to accumulate all files.
I have an archive repo (rsync) and a smallarchive repo (glacier). The assistant is now trying to transfer everything up to glacier. This is new behavior as of this version of annex.
### What steps will reproduce the problem?
### What version of git-annex are you using? On what operating system?
Mac OSX 10.8.3 (Build 12D78)
git-annex version: 4.20130501-ged2fc6f
local repository version: 4
default repository version: 3
supported repository versions: 3 4
upgrade supported from repository versions: 0 1 2
build flags: Assistant Webapp Pairing Testsuite S3 WebDAV FsEvents XMPP DNS
### Please provide any additional information below.
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/debug.log
# End of transcript or log.
"""]]

View file

@ -0,0 +1,16 @@
### Please describe the problem.
Bad input data given to gpg will make it lock.
### What steps will reproduce the problem?
Trying to download gpg encrypted data from remote with bad/incorrect data
### What version of git-annex are you using? On what operating system?
4.20130501-gd9e288b, on ubuntu 13.04
### Please provide any additional information below.
Transcript
http://paste.ubuntu.com/5626517/
Note: The problem is most likely caused by bad data from either the nntp hooks program, or the nntp server itself.
I also have one file with bad data that consistently is NOT a problem for gpg to handle(lines 24-25 of log).