You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by br...@apache.org on 2014/02/11 04:29:10 UTC
svn commit: r1566978 - in /subversion/trunk/subversion:
include/svn_error_codes.h libsvn_subr/sqlite.c
Author: breser
Date: Tue Feb 11 03:29:09 2014
New Revision: 1566978
URL: http://svn.apache.org/r1566978
Log:
Add new error code for runtime compatibility tests.
* subversion/include/svn_error_codes.h
(SVN_ERR_UNSUPPORTED_DEPENDENCY): New.
* subversion/libsvn_subr/sqlite.c
(svn_sqlite__open): Use the new code.
Modified:
subversion/trunk/subversion/include/svn_error_codes.h
subversion/trunk/subversion/libsvn_subr/sqlite.c
Modified: subversion/trunk/subversion/include/svn_error_codes.h
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/include/svn_error_codes.h?rev=1566978&r1=1566977&r2=1566978&view=diff
==============================================================================
--- subversion/trunk/subversion/include/svn_error_codes.h (original)
+++ subversion/trunk/subversion/include/svn_error_codes.h Tue Feb 11 03:29:09 2014
@@ -1420,6 +1420,11 @@ SVN_ERROR_START
SVN_ERR_MISC_CATEGORY_START + 42,
"Additional errors:")
+ /** @since New in 1.9. */
+ SVN_ERRDEF(SVN_ERR_UNSUPPORTED_DEPENDENCY,
+ SVN_ERR_MISC_CATEGORY_START + 43,
+ "Dependency failed runtime compatibility test")
+
/* command-line client errors */
SVN_ERRDEF(SVN_ERR_CL_ARG_PARSING_ERROR,
Modified: subversion/trunk/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_subr/sqlite.c?rev=1566978&r1=1566977&r2=1566978&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/trunk/subversion/libsvn_subr/sqlite.c Tue Feb 11 03:29:09 2014
@@ -1079,12 +1079,12 @@ svn_sqlite__open(svn_sqlite__db_t **db,
/* runtime check for https://www.sqlite.org/src/info/4c86b126f2 */
#if SQLITE_VERSION_NUMBER > 3008000 && SQLITE_VERSION_NUMBER < 3008004
if (sqlite3_compileoption_used("ENABLE_STAT3"))
- return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ return svn_error_createf(SVN_ERR_UNSUPPORTED_DEPENDENCY, NULL,
_("'%s' compile time SQLite option is broken "
"with SQLite 3.8.1 - 3.8.3"),
"SQLITE_ENABLE_STAT3");
if (sqlite3_compileoption_used("ENABLE_STAT4"))
- return svn_error_createf(SVN_ERR_UNSUPPORTED_FEATURE, NULL,
+ return svn_error_createf(SVN_ERR_UNSUPPORTED_DEPENDENCY, NULL,
_("'%s' compile time SQLite option is broken "
"with SQLite 3.8.1 - 3.8.3"),
"SQLITE_ENABLE_STAT4");