summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Joseph Davis <davisp@apache.org>2009-10-14 20:45:30 +0000
committerPaul Joseph Davis <davisp@apache.org>2009-10-14 20:45:30 +0000
commit42c66936ffc16e887398ec28ab198e7a6592f277 (patch)
tree5aaa1786180f01580a7bf0c95735da4e0d9e687c
parent8729b80562450cfce513cbe55046441829202e9b (diff)
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. git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@825268 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--src/couchdb/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am
index 34aaf2c7..2fc2340a 100644
--- a/src/couchdb/Makefile.am
+++ b/src/couchdb/Makefile.am
@@ -197,7 +197,7 @@ compiled_files = \
# 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" \