summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-06-18 19:34:04 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-06-18 19:34:04 +0000
commit0ca5847d527ba91fbbe0c81d40853c72054f9b5f (patch)
tree612fc74824dc9d5204df070d6e95c8fa0d3fe53f
parentb8d7c67e722f41791e7bd886bcf723b9e4aebef7 (diff)
downloadmandoc-0ca5847d527ba91fbbe0c81d40853c72054f9b5f.tar.gz
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).
-rw-r--r--mandocdb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mandocdb.c b/mandocdb.c
index ceabc5f4..033f33e9 100644
--- a/mandocdb.c
+++ b/mandocdb.c
@@ -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;