svn commit: r957596 - /couchdb/trunk/src/couchdb/couch_app.erl

[be...@apache.org]

Author: benoitc
Date: Thu Jun 24 16:03:10 2010
New Revision: 957596

URL: http://svn.apache.org/viewvc?rev=957596&view=rev
Log:
ignore error when loading public_key on R12B5. spotted by barj on irc
and fixed with help of @rnewson.

Modified:
    couchdb/trunk/src/couchdb/couch_app.erl

Modified: couchdb/trunk/src/couchdb/couch_app.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_app.erl?rev=957596&r1=957595&r2=957596&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_app.erl (original)
+++ couchdb/trunk/src/couchdb/couch_app.erl Thu Jun 24 16:03:10 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.