Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
cd6fd4a1d1
5 changed files with 195 additions and 0 deletions
|
|
@ -0,0 +1,42 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://peter-simons.myopenid.com/"
|
||||
ip="77.186.165.208"
|
||||
subject="comment 3"
|
||||
date="2012-03-05T21:10:47Z"
|
||||
content="""
|
||||
Unfortunately, the patch you mentioned doesn't seem to address the problem. I'm getting the following compile error:
|
||||
|
||||
Data/Digest/SHA2.hs:111:4:
|
||||
Could not deduce (Show a) arising from a use of `showHex'
|
||||
from the context (Integral a)
|
||||
bound by the instance declaration at Data/Digest/SHA2.hs:109:10-39
|
||||
Possible fix:
|
||||
add (Show a) to the context of the instance declaration
|
||||
In the first argument of `(.)', namely `(showHex a)'
|
||||
In the expression:
|
||||
(showHex a)
|
||||
. (' ' :)
|
||||
. (showHex b)
|
||||
. (' ' :)
|
||||
. (showHex c)
|
||||
. (' ' :)
|
||||
. (showHex d)
|
||||
. (' ' :)
|
||||
. (showHex e)
|
||||
. (' ' :)
|
||||
. (showHex f) . (' ' :) . (showHex g) . (' ' :) . (showHex h)
|
||||
In an equation for `showsPrec':
|
||||
showsPrec _ (Hash8 a b c d e f g h)
|
||||
= (showHex a)
|
||||
. (' ' :)
|
||||
. (showHex b)
|
||||
. (' ' :)
|
||||
. (showHex c)
|
||||
. (' ' :)
|
||||
. (showHex d)
|
||||
. (' ' :)
|
||||
. (showHex e)
|
||||
. (' ' :)
|
||||
. (showHex f) . (' ' :) . (showHex g) . (' ' :) . (showHex h)
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joey.kitenet.net/"
|
||||
nickname="joey"
|
||||
subject="comment 4"
|
||||
date="2012-03-05T21:32:00Z"
|
||||
content="""
|
||||
Hmm, I was able to produce exactly the same build error, and then I downloaded the patch I linked to before, and did
|
||||
`patch -p1 < debian/patches/class-constraints.diff` and that fixed the build nicely.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://peter-simons.myopenid.com/"
|
||||
ip="77.186.165.208"
|
||||
subject="comment 5"
|
||||
date="2012-03-05T23:29:41Z"
|
||||
content="""
|
||||
I didn't realize that the patch adds a patch file to the source distribution (instead of, well, patching it). That additional level of indirection surprised me. Anyway, now I figured it out and `Crypto` compiles fine. Thanks!
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,128 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawk_LOahrm_Cdg7io-_H0CNKkaxsRRQgRFo"
|
||||
nickname="Peter"
|
||||
subject="Test suite failure"
|
||||
date="2012-03-06T11:20:35Z"
|
||||
content="""
|
||||
I managed to compile this version of git-annex with GHC 7.4.1 on NixOS, but unfortunately the test suite fails during the `addurl` test:
|
||||
|
||||
Testing 0:quickcheck:0:prop_idempotent_deencode_git
|
||||
Testing 0:quickcheck:1:prop_idempotent_deencode
|
||||
Testing 0:quickcheck:2:prop_idempotent_fileKey
|
||||
Testing 0:quickcheck:3:prop_idempotent_key_read_show
|
||||
Testing 0:quickcheck:4:prop_idempotent_shellEscape
|
||||
Testing 0:quickcheck:5:prop_idempotent_shellEscape_multiword
|
||||
Testing 0:quickcheck:6:prop_idempotent_configEscape
|
||||
Testing 0:quickcheck:7:prop_parentDir_basics
|
||||
Testing 0:quickcheck:8:prop_relPathDirToFile_basics
|
||||
Testing 0:quickcheck:9:prop_relPathDirToFile_regressionTest
|
||||
Testing 0:quickcheck:10:prop_cost_sane
|
||||
Testing 0:quickcheck:11:prop_hmacWithCipher_sane
|
||||
Testing 0:quickcheck:12:prop_TimeStamp_sane
|
||||
Testing 0:quickcheck:13:prop_addLog_sane
|
||||
Testing 1:blackbox:0:git-annex init
|
||||
Testing 1:blackbox:1:git-annex add:0
|
||||
Testing 1:blackbox:1:git-annex add:1
|
||||
Testing 1:blackbox:1:git-annex add:2
|
||||
Testing 1:blackbox:2:git-annex reinject/fromkey
|
||||
Testing 1:blackbox:3:git-annex unannex:0:no content
|
||||
Testing 1:blackbox:3:git-annex unannex:1:with content
|
||||
Testing 1:blackbox:4:git-annex drop:0:no remotes
|
||||
Testing 1:blackbox:4:git-annex drop:1:with remote
|
||||
Testing 1:blackbox:4:git-annex drop:2:untrusted remote
|
||||
Testing 1:blackbox:5:git-annex get
|
||||
Testing 1:blackbox:6:git-annex move
|
||||
Testing 1:blackbox:7:git-annex copy
|
||||
Testing 1:blackbox:8:git-annex unlock/lock
|
||||
Testing 1:blackbox:9:git-annex edit/commit:0
|
||||
Cases: 55 Tried: 28 Errors: 0 Failures: 0add foo (checksum...) ok
|
||||
ok
|
||||
(Recording state in git...)
|
||||
Testing 1:blackbox:9:git-annex edit/commit:1
|
||||
Testing 1:blackbox:10:git-annex fix
|
||||
Testing 1:blackbox:11:git-annex trust/untrust/semitrust/dead
|
||||
Testing 1:blackbox:12:git-annex fsck:0
|
||||
Cases: 55 Tried: 32 Errors: 0 Failures: 0 Only 1 of 2 trustworthy copies exist of foo
|
||||
Back it up with git-annex copy.
|
||||
Only 1 of 2 trustworthy copies exist of sha1foo
|
||||
Back it up with git-annex copy.
|
||||
Bad file size (11 B larger); moved to /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/tmprepo/.git/annex/bad/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
|
||||
Bad file size (11 B larger); moved to /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/tmprepo/.git/annex/bad/SHA1-s25--ee80d2cec57a3810db83b80e1b320df3a3721ffa
|
||||
Testing 1:blackbox:12:git-annex fsck:1
|
||||
Testing 1:blackbox:12:git-annex fsck:2
|
||||
Cases: 55 Tried: 34 Errors: 0 Failures: 0 Only these untrusted locations may have copies of foo
|
||||
17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
|
||||
17aab099-fcde-413a-8ef1-6acc09d7d081 -- here (.t/tmprepo)
|
||||
Back it up to trusted locations with git-annex copy.
|
||||
Only these untrusted locations may have copies of sha1foo
|
||||
17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
|
||||
Back it up to trusted locations with git-annex copy.
|
||||
Testing 1:blackbox:12:git-annex fsck:3
|
||||
Cases: 55 Tried: 35 Errors: 0 Failures: 0 Only 1 of 2 trustworthy copies exist of foo
|
||||
Back it up with git-annex copy.
|
||||
The following untrusted locations may also have copies:
|
||||
17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
|
||||
Only 1 of 2 trustworthy copies exist of sha1foo
|
||||
Back it up with git-annex copy.
|
||||
The following untrusted locations may also have copies:
|
||||
17575c68-d5cc-4e18-bc96-fdafe716d488 -- origin (test repo)
|
||||
Testing 1:blackbox:13:git-annex migrate:0
|
||||
Testing 1:blackbox:13:git-annex migrate:1
|
||||
Testing 1:blackbox:14:git-annex unused/dropunused
|
||||
Testing 1:blackbox:15:git-annex addurl
|
||||
Cases: 55 Tried: 39 Errors: 0 Failures: 0git-annex: connect: timeout (Connection timed out)
|
||||
### Failure in: 1:blackbox:15:git-annex addurl
|
||||
addurl failed
|
||||
Testing 1:blackbox:16:git-annex describe
|
||||
Testing 1:blackbox:17:git-annex find
|
||||
Cases: 55 Tried: 41 Errors: 0 Failures: 1foo
|
||||
foo
|
||||
sha1foo
|
||||
sha1foo
|
||||
Testing 1:blackbox:18:git-annex merge
|
||||
Testing 1:blackbox:19:git-annex status
|
||||
Cases: 55 Tried: 43 Errors: 0 Failures: 1{\"command\":\"status\",\"supported backends\":[\"SHA256\",\"SHA1\",\"SHA512\",\"SHA224\",\"SHA384\",\"SHA256E\",\"SHA1E\",\"SHA512E\",\"SHA224E\",\"SHA384E\",\"WORM\",\"URL\"],\"supported remote types\":[\"git\",\"S3\",\"bup\",\"directory\",\"rsync\",\"web\",\"hook\"],\"trusted repositories\":[],\"semitrusted repositories\":[{\"uuid\":\"00000000-0000-0000-0000-000000000001\",\"description\":\"web\",\"here\":false},{\"uuid\":\"17575c68-d5cc-4e18-bc96-fdafe716d488\",\"description\":\"origin (test repo)\",\"here\":false},{\"uuid\":\"5b9fe416-d6ed-4df7-af67-14fc5f2ea631\",\"description\":\".t/tmprepo\",\"here\":true}],\"untrusted repositories\":[],\"dead repositories\":[],\"local annex keys\":0,\"local annex size\":\"0 bytes\",\"known annex keys\":2,\"known annex size\":\"45 bytes\",\"success\":true}
|
||||
Testing 1:blackbox:20:git-annex version
|
||||
Cases: 55 Tried: 44 Errors: 0 Failures: 1git-annex version: 3.20120230
|
||||
local repository version: 3
|
||||
default repository version: 3
|
||||
supported repository versions: 3
|
||||
upgrade supported from repository versions: 0 1 2
|
||||
Testing 1:blackbox:21:git-annex sync
|
||||
Cases: 55 Tried: 45 Errors: 0 Failures: 1# On branch master
|
||||
nothing to commit (working directory clean)
|
||||
To /tmp/nix-build-jzvhzrdysy619y4vgmafryy9ck8mz7z7-git-annex-3.20120230.drv-0/git-annex/.t/repo
|
||||
34fa270..7242932 git-annex -> git-annex
|
||||
* [new branch] master -> synced/master
|
||||
Testing 1:blackbox:22:git-annex map
|
||||
Testing 1:blackbox:23:git-annex uninit
|
||||
Cases: 55 Tried: 47 Errors: 0 Failures: 1Switched to branch 'git-annex'
|
||||
Switched to branch 'master'
|
||||
Deleted branch git-annex (was e636789).
|
||||
Testing 1:blackbox:24:git-annex upgrade
|
||||
Testing 1:blackbox:25:git-annex whereis
|
||||
Testing 1:blackbox:26:git-annex hook remote
|
||||
Testing 1:blackbox:27:git-annex directory remote
|
||||
Testing 1:blackbox:28:git-annex rsync remote
|
||||
Cases: 55 Tried: 52 Errors: 0 Failures: 1sending incremental file list
|
||||
af4/
|
||||
af4/74c/
|
||||
af4/74c/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/
|
||||
af4/74c/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77/SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
|
||||
20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/5)
|
||||
|
||||
sent 300 bytes received 43 bytes 686.00 bytes/sec
|
||||
total size is 20 speedup is 0.06
|
||||
SHA256-s20--e394a389d787383843decc5d3d99b6d184ffa5fddeec23b911f9ee7fc8b9ea77
|
||||
20 100% 0.00kB/s 0:00:00 (xfer#1, to-check=0/1)
|
||||
|
||||
sent 160 bytes received 31 bytes 382.00 bytes/sec
|
||||
total size is 20 speedup is 0.10
|
||||
Testing 1:blackbox:29:git-annex bup remote
|
||||
Testing 1:blackbox:30:git-annex crypto
|
||||
Cases: 55 Tried: 55 Errors: 0 Failures: 1
|
||||
test: failed
|
||||
** test suite failed!
|
||||
|
||||
Apparently, there is a network timeout? I see from the comments in `test.hs` that the test suite tries to avoid depending on network traffic, but is it possible, maybe, that the test tries to resolve a DNS name?
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joey.kitenet.net/"
|
||||
nickname="joey"
|
||||
subject="comment 2"
|
||||
date="2012-03-06T17:22:54Z"
|
||||
content="""
|
||||
My mistake, addurl --fast used to avoid the network, so the test suite ran it, but then it was changed to always look up the file size. Removed from test suite.
|
||||
"""]]
|
||||
Loading…
Reference in a new issue