From 74f9f78ec085fc22ffa80c5a98792cda092f0c63 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 3 Aug 2019 11:06:50 +0300 Subject: [PATCH] lib: Don't use Xapian::DatabaseNotFoundError, it's too new Xapian::DatabaseNotFoundError only arrived with Xapian 1.4.10. --- lib/mu-store.cc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/mu-store.cc b/lib/mu-store.cc index af6537ad..e14b488e 100644 --- a/lib/mu-store.cc +++ b/lib/mu-store.cc @@ -416,11 +416,11 @@ mu_store_new_readable (const char* xpath, GError **err) } catch (const NeedsReIndex& nri) { g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, "database @ %s needs (re)indexing", xpath); - } catch (const Xapian::DatabaseNotFoundError& dbe) { - g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, - "database @ %s not found", xpath); + // } catch (const Xapian::DatabaseNotFoundError& dbe) { // Xapian 1.4.10 + // g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, + // "database @ %s not found", xpath); } 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); } catch (...) { 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) { g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, "database @ %s needs (re)indexing", xpath); - } catch (const Xapian::DatabaseNotFoundError& dbe) { - g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, - "database @ %s not found", xpath); + // } catch (const Xapian::DatabaseNotFoundError& dbe) { // Xapian 1.4.10 + // g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_NEEDS_REINDEX, + // "database @ %s not found", xpath); } 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); } catch (const Xapian::DatabaseLockError& dle) { g_set_error (err, MU_ERROR_DOMAIN, MU_ERROR_XAPIAN_CANNOT_GET_WRITELOCK,