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

This commit is contained in:
Joey Hess 2012-12-11 11:24:52 -04:00
commit 85991ac73f
2 changed files with 53 additions and 0 deletions

View file

@ -0,0 +1,45 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkSq2FDpK2n66QRUxtqqdbyDuwgbQmUWus"
nickname="Jimmy"
subject="comment 2"
date="2012-12-11T08:29:07Z"
content="""
yea its a problem with testpack rather than git-annex's test suite,
<pre>
[jtang@laplace git-annex (master)]$ cabal install testpack
Resolving dependencies...
Configuring testpack-2.1.2...
Building testpack-2.1.2...
Preprocessing library testpack-2.1.2...
[1 of 3] Compiling Test.QuickCheck.Instances ( src/Test/QuickCheck/Instances.hs, dist/build/Test/QuickCheck/Instances.o )
[2 of 3] Compiling Test.QuickCheck.Tools ( src/Test/QuickCheck/Tools.hs, dist/build/Test/QuickCheck/Tools.o )
src/Test/QuickCheck/Tools.hs:33:9:
Warning: Fields of `MkResult' not initialised: abort
In the expression:
MkResult
{ok = Just (expected == actual), expect = True,
interrupted = False,
reason = \"Result: expected \"
++ show expected ++ \", got \" ++ show actual,
stamp = [], callbacks = []}
In an equation for `@=?':
expected @=? actual
= MkResult
{ok = Just (expected == actual), expect = True,
interrupted = False,
reason = \"Result: expected \"
++ show expected ++ \", got \" ++ show actual,
stamp = [], callbacks = []}
[3 of 3] Compiling Test.HUnit.Tools ( src/Test/HUnit/Tools.hs, dist/build/Test/HUnit/Tools.o )
src/Test/HUnit/Tools.hs:131:57:
`maxDiscard' is not a (visible) constructor field name
src/Test/HUnit/Tools.hs:177:40: Not in scope: `maxDiscard'
cabal: Error: some packages failed to install:
testpack-2.1.2 failed during the building phase. The exception was:
ExitFailure 1
</pre>
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkk3K0AUduAybbBO_LRRGKOe2zcGeezbzI"
nickname="Nathan"
subject="comment 5"
date="2012-12-11T04:15:49Z"
content="""
Thanks, Joey; I was using the standalone build, and it seems to be behaving better now.
"""]]