summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-07-08 13:16:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-07-08 13:16:12 -0400
commit032c0e1755ee0a4f5d61cc8f55a06c0f7df0fdaf (patch)
tree9872f26f278cf58d67dfb09d0e326026d80d7266
parent53483db2154380ddb3ce1f0d6e0612cfe2a54840 (diff)
OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing gpg-agent.
-rw-r--r--debian/changelog2
-rw-r--r--doc/bugs/GPG_problem_on_Mac.mdwn3
2 files changed, 5 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 16a0466e2..92e5ab503 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,8 @@ git-annex (4.20130628) UNRELEASED; urgency=low
* webapp: Fix authorized_keys line added when setting up a rsync remote
on a server that also supports git-annex, to not force running
git-annex-shell.
+ * OSX Mountain Lion: Fixed gpg bundled in dmg to not fail due to a missing
+ gpg-agent.
-- Joey Hess <joeyh@debian.org> Tue, 02 Jul 2013 15:40:55 -0400
diff --git a/doc/bugs/GPG_problem_on_Mac.mdwn b/doc/bugs/GPG_problem_on_Mac.mdwn
index de45ac8ae..dc4cfaae0 100644
--- a/doc/bugs/GPG_problem_on_Mac.mdwn
+++ b/doc/bugs/GPG_problem_on_Mac.mdwn
@@ -29,3 +29,6 @@ gpg: problem with the agent: No agent running
27/Jun/2013:13:41:37 +0200 [Error#yesod-core] user error (gpg ["--quiet","--trust-model","always","--batch","--passphrase-fd","21","--symmetric","--force-mdc"] exited 2) @(yesod-core-1.1.8.3:Yesod.Internal.Core ./Yesod/Internal/Core.hs:550:5)
# End of transcript or log.
"""]]
+
+> [[done]]; I've updated the OSX autobuild to
+> use a gpg that doesn't fail when gpg-agent is missing. --[[Joey]]