summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBenoit Chesneau <benoitc@apache.org>2010-06-24 16:03:10 +0000
committerBenoit Chesneau <benoitc@apache.org>2010-06-24 16:03:10 +0000
commitbb7575d2cdc791f31c09181ce9a4c82559629564 (patch)
tree3b93edf68c34eb81ae9ad997f638e0eae1b847e9 /src
parent4b079e27429567b520abf091a8c0da84885c0d80 (diff)
ignore error when loading public_key on R12B5. spotted by barj on irc
and fixed with help of @rnewson. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@957596 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src')
-rw-r--r--src/couchdb/couch_app.erl3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl
index c16412a3..232953d9 100644
--- a/src/couchdb/couch_app.erl
+++ b/src/couchdb/couch_app.erl
@@ -48,6 +48,9 @@ start_apps([App|Rest]) ->
start_apps(Rest);
{error, {already_started, App}} ->
start_apps(Rest);
+ {error, _Reason} when App =:= public_key ->
+ % ignore on R12B5
+ start_apps(Rest);
{error, _Reason} ->
{error, {app_would_not_start, App}}
end.