You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by jc...@apache.org on 2009/04/16 01:25:58 UTC
svn commit: r765422 - in /couchdb/branches/0.9.x: ./ etc/default/couchdb
src/couchdb/couch_config.erl
Author: jchris
Date: Wed Apr 15 23:25:57 2009
New Revision: 765422
URL: http://svn.apache.org/viewvc?rev=765422&view=rev
Log:
merged revision 765420 from trunk
Modified:
couchdb/branches/0.9.x/ (props changed)
couchdb/branches/0.9.x/etc/default/couchdb (props changed)
couchdb/branches/0.9.x/src/couchdb/couch_config.erl
Propchange: couchdb/branches/0.9.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 23:25:57 2009
@@ -1,3 +1,3 @@
/couchdb/branches/design_resources:751716-751803
/couchdb/branches/form:729440-730015
-/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016
+/couchdb/trunk:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420
Propchange: couchdb/branches/0.9.x/etc/default/couchdb
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Apr 15 23:25:57 2009
@@ -1,4 +1,4 @@
/couchdb/branches/design_resources/etc/default/couchdb:751716-751803
/couchdb/branches/form/etc/default/couchdb:729440-730015
-/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016
+/couchdb/trunk/etc/default/couchdb:758717,760442,760503,760532,760535,760537-760539,761343,761347-761348,761352-761353,761355,762016,765420
/incubator/couchdb/trunk/etc/default/couchdb:642419-694440
Modified: couchdb/branches/0.9.x/src/couchdb/couch_config.erl
URL: http://svn.apache.org/viewvc/couchdb/branches/0.9.x/src/couchdb/couch_config.erl?rev=765422&r1=765421&r2=765422&view=diff
==============================================================================
--- couchdb/branches/0.9.x/src/couchdb/couch_config.erl (original)
+++ couchdb/branches/0.9.x/src/couchdb/couch_config.erl Wed Apr 15 23:25:57 2009
@@ -118,11 +118,11 @@
IniBin =
case file:read_file(IniFilename) of
{ok, IniBin0} ->
- IniBin0;
+ IniBin0;
{error, enoent} ->
- Msg = io_lib:format("Couldn't find server configuration file ~s.", [IniFilename]),
- ?LOG_ERROR("~s~n", [Msg]),
- throw({startup_error, Msg})
+ Msg = ?l2b(io_lib:format("Couldn't find server configuration file ~s.", [IniFilename])),
+ ?LOG_ERROR("~s~n", [Msg]),
+ throw({startup_error, Msg})
end,
{ok, Lines} = regexp:split(binary_to_list(IniBin), "\r\n|\n|\r|\032"),