diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-07-08 14:04:43 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-07-08 14:04:43 -0400 |
| commit | f09d3686917ec71edeb39c0b32c509fe22af4b97 (patch) | |
| tree | 418a030a1dad46acf39c4024e7d8fae9cf950bcb | |
| parent | 032c0e1755ee0a4f5d61cc8f55a06c0f7df0fdaf (diff) | |
| parent | 34f3c637df1708f10a71a0ccaf184bbc86a3fe75 (diff) | |
Merge branch 'master' of ssh://git-annex.branchable.com
2 files changed, 20 insertions, 0 deletions
diff --git a/doc/bugs/GPG_problem_on_Mac/comment_3_388238360f2423f84881e904443efb86._comment b/doc/bugs/GPG_problem_on_Mac/comment_3_388238360f2423f84881e904443efb86._comment new file mode 100644 index 000000000..3e8b01d24 --- /dev/null +++ b/doc/bugs/GPG_problem_on_Mac/comment_3_388238360f2423f84881e904443efb86._comment @@ -0,0 +1,12 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.254.222" + subject="comment 3" + date="2013-07-08T17:10:53Z" + content=""" +The git-annex dmg includes a copy of gpg. + +It seems that the build machine has been switched to having MacGPG2 installed, which hard-codes the location of gpg-agent inside it. This did not used to be the case, and I don't want to use this MacGPG2 build in the dmg. + +Guess I'll have to build gpg from source myself on the mac to get a sane version to distribute.. +"""]] diff --git a/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_8_4e8982668b5044b2286d55c90adb9da3._comment b/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_8_4e8982668b5044b2286d55c90adb9da3._comment new file mode 100644 index 000000000..b91884642 --- /dev/null +++ b/doc/bugs/internal_server_error_when_choosing_encrypted_rsync_repo_option/comment_8_4e8982668b5044b2286d55c90adb9da3._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.254.222" + subject="comment 8" + date="2013-07-08T18:03:54Z" + content=""" +Actually MacGPG caused problems on mountian lion and I have switched to gpg 1.4.13 from brew. +"""]] |