You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by fd...@apache.org on 2010/10/26 01:46:40 UTC
svn commit: r1027315 -
/couchdb/branches/new_replicator/src/couchdb/couch_app.erl
Author: fdmanana
Date: Mon Oct 25 23:46:40 2010
New Revision: 1027315
URL: http://svn.apache.org/viewvc?rev=1027315&view=rev
Log:
Merged revision 957596 from trunk:
ignore error when loading public_key on R12B5. spotted by barj on irc
and fixed with help of @rnewson.
Modified:
couchdb/branches/new_replicator/src/couchdb/couch_app.erl
Modified: couchdb/branches/new_replicator/src/couchdb/couch_app.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/new_replicator/src/couchdb/couch_app.erl?rev=1027315&r1=1027314&r2=1027315&view=diff
==============================================================================
--- couchdb/branches/new_replicator/src/couchdb/couch_app.erl (original)
+++ couchdb/branches/new_replicator/src/couchdb/couch_app.erl Mon Oct 25 23:46:40 2010
@@ -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.