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

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

Browse source
This commit is contained in:
Joey Hess 2013-04-14 16:58:10 -04:00
commit a684843d8e
4 changed files with 64 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
doc/bugs/The_restricted_ssh_key_pair_makes_password_login___40__nearly__41___impossible/comment_17_2fa5d7d9110c91b0a3a833cb3d9f53fd._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="marvin"
ip="91.152.75.65"
subject="comment 17"
date="2013-04-14T20:07:33Z"
content="""
YES! Straight from the tty console it works correctly. Seems this project unearths lots of bugs all over the place.
Thank you!
"""]]

10
doc/bugs/The_restricted_ssh_key_pair_makes_password_login___40__nearly__41___impossible/comment_18_bf21d28142e4c304aa0bc740955ddea0._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 18"
date="2013-04-14T20:13:54Z"
content="""
@Marvin, just to be clear, it was `ssh-add -D` that fixed it for you?
To make the fix stick, you need to make a ~/.ssh/annex/ directory, and move the keys to there, and then edit ~/.ssh/config to use the new path to the key file. This should prevent gnome-keyring from seeing them.
"""]]

8
doc/bugs/The_restricted_ssh_key_pair_makes_password_login___40__nearly__41___impossible/comment_19_45537758fa937f16fc82120bf8b234e8._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="marvin"
ip="91.152.75.65"
subject="comment 19"
date="2013-04-14T20:47:37Z"
content="""
nope, ssh-add -D doesn't seem to help. Killing gnome-keyring-daemon does.
"""]]

36
doc/install/OSX/comment_16_1befafa862b7d07b1f6e57c0182497cf._comment Normal file
View file

@ -0,0 +1,36 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc"
nickname="Bret"
subject="Snow Leopard Issues"
date="2013-04-14T20:17:17Z"
content="""
I was able to build snow leopard completely for the first time over last night (it took a very long time to build all the tools and dependancies). Woohoo!
The way I was able to fully build on a 32-bit 10.6 machine was this
1. Delete ~/.ghc and ~/.cabal. They were full of random things and were causing problems.
2. `brew uninstall ghc and haskell-platform`
3. `brew update`
4. `brew install git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2`
5. `brew upgrade git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2` (Some of these were already installed/up to date.
6. `brew link libxml2`
7. `brew install haskell-platform` (This takes a long, long time).
8. `cabal update` (assuming you have added `~/.cabal/bin` to your path
9. `cabal install cablal-install`
10. `cabal install c2hs`
11. `cabal install git-annex`
It also appears to be running fairly smoothly than it had in the past on a 32-bit SL system. Thats also neat.
The problem is that it seems to not really work as git annex though, probably due to the error relating you get when you start up the webapp:
Running
`git annex webapp`
The browser starts up, and I get 3 of these errors:
`Watcher crashed: Need at least OSX 10.7.0 for file-level FSEvents`
Pairing with a local computer appears to work to systems running 10.7, but when you complete the process, they never show up in the repository list.
Also on a side note, when running `git annex webapp` it triggers the opening of an html file in whatever the default html file handler is. I edit a lot of html, so for me that is usually a text editor. I had to change the file handler to open html files with my web browser for the `git annex webapp` to actually work. Is there a way to change that so that `git annex webapp` uses the default web browser for the system rather than the default html file handler?
"""]]