couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r825268 - /couchdb/trunk/src/couchdb/Makefile.am
Date Wed, 14 Oct 2009 20:45:30 GMT
Author: davisp
Date: Wed Oct 14 20:45:30 2009
New Revision: 825268

URL: http://svn.apache.org/viewvc?rev=825268&view=rev
Log:
Fix a bug in the couch.app generation.

The couch.app module list was using '*.erl' to list the modules. This
causes issues if weird backup files are introduced into that directory.
It appears that copying to and from HFS file systems can result in files
with a prefix of '._' so that we had '._couch_server.erl' amongst other
things which would then be in the couch.app module list, which would then
prevent the server from booting properly. As in, it would just halt before
any CouchDB code was ever run.

The fix is to make the module list use "couch*.erl" instead.


Modified:
    couchdb/trunk/src/couchdb/Makefile.am

Modified: couchdb/trunk/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/Makefile.am?rev=825268&r1=825267&r2=825268&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/Makefile.am (original)
+++ couchdb/trunk/src/couchdb/Makefile.am Wed Oct 14 20:45:30 2009
@@ -197,7 +197,7 @@
 #     couch_view.html
 
 couch.app: couch.app.tpl
-	modules=`find . -name "*.erl" -exec basename {} .erl \; | tr '\n' ',' | sed "s/,$$//"`;
\
+	modules=`find . -name "couch*.erl" -exec basename {} .erl \; | tr '\n' ',' | sed "s/,$$//"`;
\
 	sed -e "s|%package_name%|@package_name@|g" \
 	    -e "s|%version%|@version@|g" \
 	    -e "s|@modules@|$$modules|g" \



Mime
View raw message