diff options
| author | Zuul <zuul@review.openstack.org> | 2018-08-03 00:57:57 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-08-03 00:57:57 +0000 |
| commit | 12425917bfc4899774af5330816e9c1c370b3932 (patch) | |
| tree | 6b1746f713020d88a9c869501cedf6614d54623c | |
| parent | 679960cbef0c5329ad9a33e4118f1014f51d5999 (diff) | |
| parent | b7adec7c688ca34f4fa4f11dae7c4078595cb7a5 (diff) | |
| download | swift-12425917bfc4899774af5330816e9c1c370b3932.tar.gz | |
Merge "Be more tolerant of exception messages from sqlite" into stable/pike
| -rw-r--r-- | swift/common/db.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/swift/common/db.py b/swift/common/db.py index 91cb91976..ce4def9d0 100644 --- a/swift/common/db.py +++ b/swift/common/db.py @@ -333,7 +333,9 @@ class DatabaseBroker(object): exc_hint = 'malformed' elif 'malformed database schema' in str(exc_value): exc_hint = 'malformed' - elif 'file is encrypted or is not a database' in str(exc_value): + elif ' is not a database' in str(exc_value): + # older versions said 'file is not a database' + # now 'file is encrypted or is not a database' exc_hint = 'corrupted' elif 'disk I/O error' in str(exc_value): exc_hint = 'disk error while accessing' |