diff options
| author | Paul Joseph Davis <davisp@apache.org> | 2009-08-16 02:37:57 +0000 |
|---|---|---|
| committer | Paul Joseph Davis <davisp@apache.org> | 2009-08-16 02:37:57 +0000 |
| commit | 3975b8758a6aa58389a74eba15e1908ef86465d8 (patch) | |
| tree | 7ff4a242ce27b12c43e103afb15d1169bb07504c | |
| parent | 165531bcf223f1c05c4c2eaef7cd2f2943c10584 (diff) | |
Update our Erlang VM requirement to 5.6.5 (R12B5). Also fixes the remaining two
compiler warnings.
git-svn-id: https://svn.apache.org/repos/asf/couchdb/trunk@804552 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | src/couchdb/couch_httpd_view.erl | 2 | ||||
| -rw-r--r-- | src/couchdb/couch_rep_reader.erl | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 35fd3de1..c7b766f2 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,7 @@ if test x${ERL} = x; then AC_MSG_ERROR([Could not find the `erl' executable. Is Erlang installed?]) fi -erlang_version_error="The installed Erlang version is less than 5.6.0 (R12B)." +erlang_version_error="The installed Erlang version is less than 5.6.5 (R12B05)." version="`${ERL} -version 2>&1 | ${SED} "s/[[^0-9]]/ /g"`" @@ -160,6 +160,12 @@ if test `echo $version | ${AWK} "{print \\$2}"` -lt 6; then AC_MSG_ERROR([$erlang_version_error]) fi +if test `echo $version | ${AWK} "{print \\$2}"` -eq 6; then + if test `echo $version | ${AWK} "{print \\$3}"` -lt 5; then + AC_MSG_ERROR([$erlang_version_error]) + fi +fi + AC_PATH_PROG([ERLC], [erlc]) if test x${ERLC} = x; then diff --git a/src/couchdb/couch_httpd_view.erl b/src/couchdb/couch_httpd_view.erl index 8264186b..d2f22c77 100644 --- a/src/couchdb/couch_httpd_view.erl +++ b/src/couchdb/couch_httpd_view.erl @@ -611,7 +611,7 @@ send_json_reduce_row(Resp, {Key, Value}, RowFront) -> view_group_etag(Group, Db) -> view_group_etag(Group, Db, nil). -view_group_etag(#group{sig=Sig,current_seq=CurrentSeq}, Db, Extra) -> +view_group_etag(#group{sig=Sig,current_seq=CurrentSeq}, _Db, Extra) -> % ?LOG_ERROR("Group ~p",[Group]), % This is not as granular as it could be. % If there are updates to the db that do not effect the view index, diff --git a/src/couchdb/couch_rep_reader.erl b/src/couchdb/couch_rep_reader.erl index d17c6c59..bcb971bb 100644 --- a/src/couchdb/couch_rep_reader.erl +++ b/src/couchdb/couch_rep_reader.erl @@ -93,8 +93,8 @@ handle_info({'DOWN', Ref, _, _, Reason}, State) -> handle_info({'EXIT', Loop, complete}, #state{reader_loop=Loop} = State) -> handle_reader_loop_complete(State). -terminate(Reason, _State) -> - % ?LOG_INFO("rep reader terminating with reason ~p", [Reason]), +terminate(_Reason, _State) -> + % ?LOG_INFO("rep reader terminating with reason ~p", [_Reason]), ok. code_change(_OldVsn, State, _Extra) -> |