couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject svn commit: r804552 - in /couchdb/trunk: configure.ac src/couchdb/couch_httpd_view.erl src/couchdb/couch_rep_reader.erl
Date Sun, 16 Aug 2009 02:37:57 GMT
Author: davisp
Date: Sun Aug 16 02:37:57 2009
New Revision: 804552

URL: http://svn.apache.org/viewvc?rev=804552&view=rev
Log:
Update our Erlang VM requirement to 5.6.5 (R12B5). Also fixes the remaining two
compiler warnings.


Modified:
    couchdb/trunk/configure.ac
    couchdb/trunk/src/couchdb/couch_httpd_view.erl
    couchdb/trunk/src/couchdb/couch_rep_reader.erl

Modified: couchdb/trunk/configure.ac
URL: http://svn.apache.org/viewvc/couchdb/trunk/configure.ac?rev=804552&r1=804551&r2=804552&view=diff
==============================================================================
--- couchdb/trunk/configure.ac (original)
+++ couchdb/trunk/configure.ac Sun Aug 16 02:37:57 2009
@@ -148,7 +148,7 @@
     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 @@
     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

Modified: couchdb/trunk/src/couchdb/couch_httpd_view.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_httpd_view.erl?rev=804552&r1=804551&r2=804552&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_httpd_view.erl (original)
+++ couchdb/trunk/src/couchdb/couch_httpd_view.erl Sun Aug 16 02:37:57 2009
@@ -611,7 +611,7 @@
 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,

Modified: couchdb/trunk/src/couchdb/couch_rep_reader.erl
URL: http://svn.apache.org/viewvc/couchdb/trunk/src/couchdb/couch_rep_reader.erl?rev=804552&r1=804551&r2=804552&view=diff
==============================================================================
--- couchdb/trunk/src/couchdb/couch_rep_reader.erl (original)
+++ couchdb/trunk/src/couchdb/couch_rep_reader.erl Sun Aug 16 02:37:57 2009
@@ -93,8 +93,8 @@
 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) ->



Mime
View raw message