diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2014-06-18 19:34:04 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2014-06-18 19:34:04 +0000 |
| commit | 4808ca5f163154292de44c6e56a5c97a948e2dbc (patch) | |
| tree | acd0a9b4e359d21b0b7203c6be38255d073224cd /mandocdb.c | |
| parent | 6e3d4e3da5be327a484cfa389f0a077a00a3cdba (diff) | |
| download | mandoc-4808ca5f163154292de44c6e56a5c97a948e2dbc.tar.gz mandoc-4808ca5f163154292de44c6e56a5c97a948e2dbc.tar.zst mandoc-4808ca5f163154292de44c6e56a5c97a948e2dbc.zip | |
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).
Diffstat (limited to 'mandocdb.c')
| -rw-r--r-- | mandocdb.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 <kristaps@bsd.lv> * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> @@ -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; |