summaryrefslogtreecommitdiff
path: root/src/couchdb/couch_app.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/couchdb/couch_app.erl')
-rw-r--r--src/couchdb/couch_app.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/couchdb/couch_app.erl b/src/couchdb/couch_app.erl
index 1b64434a..232953d9 100644
--- a/src/couchdb/couch_app.erl
+++ b/src/couchdb/couch_app.erl
@@ -20,7 +20,7 @@
start(_Type, DefaultIniFiles) ->
IniFiles = get_ini_files(DefaultIniFiles),
- case start_apps([crypto, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
+ case start_apps([crypto, public_key, sasl, inets, oauth, ssl, ibrowse, mochiweb]) of
ok ->
couch_server_sup:start_link(IniFiles);
{error, Reason} ->
@@ -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.