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

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

Browse source
This commit is contained in:
Joey Hess 2012-11-16 00:13:03 -04:00
commit 33c17d7034
7 changed files with 133 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04.mdwn Normal file
View file

@ -0,0 +1,92 @@
What steps will reproduce the problem?
* Start with Ubuntu 12.04
* sudo apt-get install haskell-platform libgsasl7-dev gsasl g2hs
* cabal install git-annex --bindir=$HOME/bin
What is the expected output? What do you see instead?
Expected omething like "installation successful"
Actual output, after build notices:
Loading package IfElse-0.85 ... linking ... done.
Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libdiskfree.o ... done
Loading object (static) dist/build/git-annex/git-annex-tmp/Utility/libmounts.o ... done
final link ... done
[157 of 279] Compiling Assistant.Types.DaemonStatus ( Assistant/Types/DaemonStatus.hs, dist/build/git-annex/git-annex-tmp/Assistant/Types/DaemonStatus.o )
[158 of 279] Compiling Assistant.Monad ( Assistant/Monad.hs, dist/build/git-annex/git-annex-tmp/Assistant/Monad.o )
Assistant/Monad.hs:86:16:
Couldn't match expected type `Assistant a'
with actual type `Reader AssistantData a'
Expected type: (AssistantData -> a) -> Assistant a
Actual type: (AssistantData -> a) -> Reader AssistantData a
In the expression: reader
In an equation for `getAssistant': getAssistant = reader
Assistant/Monad.hs:93:15:
Couldn't match expected type `Assistant t0'
with actual type `Reader r0 a0'
In the return type of a call of `reader'
In a stmt of a 'do' block: st <- reader threadState
In the expression:
do { st <- reader threadState;
liftIO $ runThreadState st a }
Assistant/Monad.hs:99:14:
Couldn't match expected type `Assistant t0'
with actual type `Reader r0 a0'
In the return type of a call of `reader'
In a stmt of a 'do' block: d <- reader id
In the expression:
do { d <- reader id;
liftIO $ io $ runAssistant d a }
Assistant/Monad.hs:105:14:
Couldn't match expected type `Assistant t0'
with actual type `Reader r0 a0'
In the return type of a call of `reader'
In a stmt of a 'do' block: d <- reader id
In the expression:
do { d <- reader id;
return $ runAssistant d a }
Assistant/Monad.hs:110:14:
Couldn't match expected type `Assistant t0'
with actual type `Reader r0 a0'
In the return type of a call of `reader'
In a stmt of a 'do' block: d <- reader id
In the expression:
do { d <- reader id;
return $ \ v -> runAssistant d $ a v }
Assistant/Monad.hs:115:14:
Couldn't match expected type `Assistant t0'
with actual type `Reader r0 a0'
In the return type of a call of `reader'
In a stmt of a 'do' block: d <- reader id
In the expression:
do { d <- reader id;
return $ \ v1 v2 -> runAssistant d (a v1 v2) }
Assistant/Monad.hs:120:12:
Couldn't match expected type `Assistant a0'
with actual type `Reader r0 a1'
In the return type of a call of `reader'
In the first argument of `(>>=)', namely `reader v'
In the expression: reader v >>= liftIO . io
cabal: Error: some packages failed to install:
git-annex-3.20121112 failed during the building phase. The exception was:
ExitFailure 1
What version of git-annex are you using? On what operating system?
git annex 3.20121112
Ubuntu 12.04 (current "long term support", all packages up to date)
Please provide any additional information below.
No idea how important this is for git-annex in general but reporting in case it is. Thank you for working on git annex!

8
doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04/comment_1_ce2efd2196e7682f4cdbabdb0616d449._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.252.11.120"
subject="comment 1"
date="2012-11-15T17:53:25Z"
content="""
I'm not quite sure what's going on here, but my guess is it's an out of date version of the haskell mtl library. Try installing a newer one with 'cabal install mtl'
"""]]

10
doc/bugs/3.20121112_build_fails_on_Ubuntu_12.04/comment_2_2a6faf662ebb85a8f1c89adcdfb9adb6._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnZEanlyzay_QlEAL0CWpyZcRTyN7vay8U"
nickname="Carlo"
subject="Not resolved"
date="2012-11-15T21:44:11Z"
content="""
I did as instructed, same behavior though.
I'll wait or keep trying things, whatever works better for you.
"""]]

10
doc/bugs/OSX_git-annex.app_error:__LSOpenURLsWithRole__40____41__/comment_4_23078dfea127fa3ef20696eb10ce964c._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlfvsw_0TFUvMcHVBRw1D1UmAaOJ3VsNSU"
nickname="chee"
subject="comment 4"
date="2012-11-16T03:14:50Z"
content="""
Same error here, 10.8.2
https://snaek.org/resources/ff40b1c2fd9486614c7df72aaeca9755fb43d6ff.png
"""]]

2
doc/design/assistant/polls/prioritizing_special_remotes.mdwn
View file

@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
Help me prioritize my work: What special remote would you most like
to use with the git-annex assistant?
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com" 62 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 5 "OpenStack SWIFT" 23 "Google Drive"]]
[[!poll open=yes 15 "Amazon S3 (done)" 12 "Amazon Glacier" 9 "Box.com" 62 "My phone (or MP3 player)" 15 "Tahoe-LAFS" 6 "OpenStack SWIFT" 23 "Google Drive"]]
This poll is ordered with the options I consider easiest to build
listed first. Mostly because git-annex already supports them and they

1
doc/forum/Push__47__Pull_with_the_Assistant.mdwn Normal file
View file

@ -0,0 +1 @@
If I use git-annex with a centralized bare git repository as [described here](http://git-annex.branchable.com/tips/centralized_git_repository_tutorial/), will the Assistant automatically `git push` and `git pull` the master and git-annex branches? Or does it basically just do a `git annex sync`?

11
doc/install/OSX/comment_10_4d15bfc4fc26e7249953bebfbb09e0aa._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkp-1EQboBDqZ05MxOHNkwNQDM4luWYioA"
nickname="Charles"
subject="comment 10"
date="2012-11-15T13:26:57Z"
content="""
Installing it with brew, I had to do the following steps before the final `cabal` command:
* `cabal install c2hs`
* add `$HOME/.cabal/bin` to my `$PATH` (so that c2hs program can be found)
"""]]