summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Bruhin <me@the-compiler.org>2019-10-29 20:54:35 +0100
committerFlorian Bruhin <me@the-compiler.org>2019-11-22 15:32:40 +0100
commit6b141021de6ae4b475b87af653baba6339e05547 (patch)
tree7e8f80fb0675a9c1c6125f601acf4df5eca7d026
parent7b9d257d786ae4f3caf581ba10812f76fdb020e2 (diff)
downloadqutebrowser-6b141021de6ae4b475b87af653baba6339e05547.tar.gz
qutebrowser-6b141021de6ae4b475b87af653baba6339e05547.zip
Add NOTADB to known SQL errors
(cherry picked from commit d51ea32149085e5d33a197f7a2d1adf95545f4cf)
-rw-r--r--doc/changelog.asciidoc1
-rw-r--r--qutebrowser/misc/sql.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/doc/changelog.asciidoc b/doc/changelog.asciidoc
index 01d80fd83..9e9f25783 100644
--- a/doc/changelog.asciidoc
+++ b/doc/changelog.asciidoc
@@ -40,6 +40,7 @@ Fixed
- Crash when using `:debug-log-level` without a console attached.
- Downloads are now hidden properly when the browser is in fullscreen mode.
- Crash when setting `colors.webpage.bg` to an empty value with QtWebKit.
+- Crash when the history database file is not a proper sqlite database.
v1.8.1 (2019-09-27)
-------------------
diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index da509fa8c..8170ad0b9 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -45,6 +45,7 @@ class SqliteErrorCode:
CANTOPEN = '14' # unable to open database file
PROTOCOL = '15' # locking protocol error
CONSTRAINT = '19' # UNIQUE constraint failed
+ NOTADB = '26' # file is not a database
class Error(Exception):
@@ -104,6 +105,7 @@ def raise_sqlite_error(msg, error):
SqliteErrorCode.FULL,
SqliteErrorCode.CANTOPEN,
SqliteErrorCode.PROTOCOL,
+ SqliteErrorCode.NOTADB,
]
# WORKAROUND for https://bugreports.qt.io/browse/QTBUG-70506