From 4808ca5f163154292de44c6e56a5c97a948e2dbc Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Wed, 18 Jun 2014 19:34:04 +0000 Subject: [PATCH] Merge OpenBSD rev. 1.108 by sthen@; original commit message: Don't display "unable to open mandoc.db" error messages (SQLITE_CANTOPEN) in the code which opens mandocdb's sqlite database when updating/deleting individual files (as used and only really useful for pkg_add/pkg_delete). --- mandocdb.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mandocdb.c b/mandocdb.c index 05530fb0..2798efca 100644 --- a/mandocdb.c +++ b/mandocdb.c @@ -1,4 +1,4 @@ -/* $Id: mandocdb.c,v 1.148 2014/05/07 16:19:03 schwarze Exp $ */ +/* $Id: mandocdb.c,v 1.149 2014/06/18 19:34:04 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze @@ -2230,7 +2230,8 @@ dbopen(int real) rc = sqlite3_open_v2(MANDOC_DB, &db, ofl, NULL); if (SQLITE_OK != rc) { exitcode = (int)MANDOCLEVEL_SYSERR; - say(MANDOC_DB, "%s", sqlite3_errstr(rc)); + if (SQLITE_CANTOPEN != rc) + say(MANDOC_DB, "%s", sqlite3_errstr(rc)); return(0); } goto prepare_statements; -- 2.47.1