mirror of https://github.com/djcb/mu.git
lib: Don't use Xapian::DatabaseNotFoundError, it's too new
Xapian::DatabaseNotFoundError only arrived with Xapian 1.4.10.
This commit is contained in:
parent
70cb10eddb
commit
74f9f78ec0
|
@ -416,11 +416,11 @@ mu_store_new_readable (const char* xpath, GError **err)
|
||||||
} catch (const NeedsReIndex& nri) {
|
} catch (const NeedsReIndex& nri) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"database @ %s needs (re)indexing", xpath);
|
"database @ %s needs (re)indexing", xpath);
|
||||||
} catch (const Xapian::DatabaseNotFoundError& dbe) {
|
// } catch (const Xapian::DatabaseNotFoundError& dbe) { // Xapian 1.4.10
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
// g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"database @ %s not found", xpath);
|
// "database @ %s not found", xpath);
|
||||||
} catch (const Xapian::DatabaseOpeningError& dbe) {
|
} catch (const Xapian::DatabaseOpeningError& dbe) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"failed to open database @ %s", xpath);
|
"failed to open database @ %s", xpath);
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN,
|
||||||
|
@ -442,11 +442,11 @@ mu_store_new_writable (const char* xpath, GError **err)
|
||||||
} catch (const NeedsReIndex& nri) {
|
} catch (const NeedsReIndex& nri) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"database @ %s needs (re)indexing", xpath);
|
"database @ %s needs (re)indexing", xpath);
|
||||||
} catch (const Xapian::DatabaseNotFoundError& dbe) {
|
// } catch (const Xapian::DatabaseNotFoundError& dbe) { // Xapian 1.4.10
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
// g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"database @ %s not found", xpath);
|
// "database @ %s not found", xpath);
|
||||||
} catch (const Xapian::DatabaseOpeningError& dbe) {
|
} catch (const Xapian::DatabaseOpeningError& dbe) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX,
|
||||||
"failed to open database @ %s", xpath);
|
"failed to open database @ %s", xpath);
|
||||||
} catch (const Xapian::DatabaseLockError& dle) {
|
} catch (const Xapian::DatabaseLockError& dle) {
|
||||||
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK,
|
g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK,
|
||||||
|
|
Loading…
Reference in New Issue