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 2013-05-19 17:57:10 -04:00
commit 29d8cc8b76
5 changed files with 62 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/assistant/comment_1_2e9380a99bd703e92affdec4268eeb81._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnFjuvfPpi1kf6l54bxfFUm0Aw_Gf_IO0o"
nickname="Aaron"
subject="Official Raring build also does not have the Assistant enabled"
date="2013-05-19T21:52:57Z"
content="""
It seems that the Raring build does not have the WebApp enabled and will need a PPA as well, though this will apparently be included in Saucy:
https://bugs.launchpad.net/ubuntu/+source/git-annex/+bug/1084693
"""]]

21
doc/bugs/adding_an_rsync.net_repo_give_an_gpg_error/comment_1_f55cfc133be72ac10cae93c877c487df._comment Normal file
View file

@ -0,0 +1,21 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 1"
date="2013-05-19T21:09:54Z"
content="""
I'm seeing some indications (this bug and also the [[git_annex_fork_bombs_on_gpg_file]] bug) that gpg is somehow broken on OSX.
Aha. I just tried on my build box, and:
<pre>
oberon:~ joeyh$ gpg
dyld: warning, LC_RPATH @loader_path/../lib in /usr/local/bin/gpg being ignored in restricted program because of @loader_path
dyld: Library not loaded: @rpath/libz.1.2.7.dylib
Referenced from: /usr/local/bin/gpg
Reason: image not found
</pre>
So, I'm packing up a broken gpg. Need to fix that then..
"""]]

12
doc/bugs/git_annex_fork_bombs_on_gpg_file/comment_11_ad13e3221ae06086e86800316912d951._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
nickname="joey"
subject="comment 11"
date="2013-05-19T21:13:41Z"
content="""
You're certianly welcome.
So, you did not install git-annex from the dmg? That bundles its own gpg.
I'm curious about this passphrase thing.. Does gpgtools + gpg2 on the Mac cause it to ask for a passphrase better, like in a dialog window? Perhaps I can improve the gpg stuff bundled in the dmg..
"""]]

8
doc/bugs/git_annex_fork_bombs_on_gpg_file/comment_12_41746b731eae7f280bb668c776022bcb._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://me.tinco.nl/"
nickname="Tinco"
subject="comment 12"
date="2013-05-19T21:24:48Z"
content="""
Yes exactly, it spawns a dialog window and overall has a very nice interface for managing gpg keys. I switched from the DMG to cabal because I couldn't get the bundled gpg to ask for my password, setting up a gpg-agent seemed pretty complicated, so I just went for the packaged approach from https://gpgtools.org/.
"""]]

12
doc/forum/exclude_files_from_annex/comment_2_03d4599fdceb3dff184eed82824674bc._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnSenxKyE_2Z6Wb-EBMO8FciyRywjx1ZiQ"
nickname="Walter"
subject="comment 2"
date="2013-05-19T21:35:37Z"
content="""
This seems to have stopped happening, after I installed a newer version (from git) of git-annex.
I might try and recreate it later, but for now it seems to work as expected.
Thanks for your help.
"""]]