diff options
-rw-r--r-- | NEWS | 3 | ||||
-rw-r--r-- | src/builtin/db.bi | 5 |
2 files changed, 3 insertions, 5 deletions
@@ -1,4 +1,4 @@ -Mailfromd NEWS -- history of user-visible changes. 2018-11-05 +Mailfromd NEWS -- history of user-visible changes. 2018-11-08 See the end of file for copying conditions. Please send Mailfromd bug reports to <bug-mailfromd@gnu.org.ua> @@ -10,6 +10,7 @@ Version 8.6.90 (Git) ** Arguments in transaction between mailfromd and calloutd are quoted ** Avoid false failures in testsuite due to libadns warnings ** configure --with-dbm=T accepts any T supported by mailutils +** The 'dbdel' built-in silently ignores non-existing keys Version 8.6, 2018-07-24 diff --git a/src/builtin/db.bi b/src/builtin/db.bi index 8dea160e..4ef11b14 100644 --- a/src/builtin/db.bi +++ b/src/builtin/db.bi @@ -404,11 +404,8 @@ MF_DEFUN(dbdel, VOID, STRING dbname, STRING keystr, OPTIONAL, NUMBER null, if (MF_OPTVAL(null, prop && prop->null)) key.mu_dsize++; rc = mu_dbm_delete(db, &key); - if (rc && rc != MU_ERR_FAILURE) - mu_error(_("error deleting %s from %s: %s"), - keystr, dbname, mu_dbm_strerror(db)); mu_dbm_destroy(&db); - MF_ASSERT(rc == 0, + MF_ASSERT(rc == 0 || rc == MU_ERR_NOENT, mfe_dbfailure, _("failed to delete data `%s' from `%s': %s"), keystr, |