RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Per Øyvind Karlsen Root: /v/rpm/cvs Email: [email protected] Module: rpm Date: 03-Jun-2011 15:41:38 Branch: HEAD Handle: 2011060313413700 Modified files: rpm/js rpmdbe-js.c Log: fix api breakage with bdb >= 5 Summary: Revision Changes Path 1.22 +16 -0 rpm/js/rpmdbe-js.c ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/js/rpmdbe-js.c ============================================================================ $ cvs diff -u -r1.21 -r1.22 rpmdbe-js.c --- rpm/js/rpmdbe-js.c 10 Jan 2010 18:29:12 -0000 1.21 +++ rpm/js/rpmdbe-js.c 3 Jun 2011 13:41:37 -0000 1.22 @@ -1697,7 +1697,11 @@ _DB_REP_CONF_DELAYCLIENT = -52, _DB_REP_CONF_INMEM = -53, _DB_REP_CONF_LEASE = -54, +#if (DB_VERSION_MAJOR == 5) + _DB_REP_CONF_AUTOINIT = -55, +#else _DB_REP_CONF_NOAUTOINIT = -55, +#endif _DB_REP_CONF_NOWAIT = -56, _DB_REPMGR_CONF_2SITE_STRICT= -57, @@ -1781,7 +1785,11 @@ { _TABLE(DB_REP_CONF_DELAYCLIENT) }, { _TABLE(DB_REP_CONF_INMEM) }, { _TABLE(DB_REP_CONF_LEASE) }, +#if (DB_VERSION_MAJOR == 5) + { _TABLE(DB_REP_CONF_AUTOINIT) }, +#else { _TABLE(DB_REP_CONF_NOAUTOINIT) }, +#endif { _TABLE(DB_REP_CONF_NOWAIT) }, { _TABLE(DB_REPMGR_CONF_2SITE_STRICT) }, @@ -1951,7 +1959,11 @@ case _JUMP(DB_REP_CONF_INMEM, _get_config); #endif case _JUMP(DB_REP_CONF_LEASE, _get_config); +#if (DB_VERSION_MAJOR == 5) + case _JUMP(DB_REP_CONF_AUTOINIT, _get_config); +#else case _JUMP(DB_REP_CONF_NOAUTOINIT, _get_config); +#endif case _JUMP(DB_REP_CONF_NOWAIT, _get_config); case _JUMP(DB_REPMGR_CONF_2SITE_STRICT, _get_config); #undef _JUMP @@ -2184,7 +2196,11 @@ case _JUMP(DB_REP_CONF_INMEM, _set_config); #endif case _JUMP(DB_REP_CONF_LEASE, _set_config); +#if (DB_VERSION_MAJOR == 5) + case _JUMP(DB_REP_CONF_AUTOINIT, _set_config); +#else case _JUMP(DB_REP_CONF_NOAUTOINIT, _set_config); +#endif case _JUMP(DB_REP_CONF_NOWAIT, _set_config); case _JUMP(DB_REPMGR_CONF_2SITE_STRICT, _set_config); #undef _JUMP @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
