compact: catch Xapian::Error consistently

[notmuch] / lib / database.cc

diff --git a/lib/database.cc b/lib/database.cc
index 3c008d68da777a4b3324e2bb2359500ef74e37e8..3530cb650afba31748ea6fe9a15221fd8943ba16 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -918,8 +918,8 @@ notmuch_database_compact (const char *path,
        compactor.add_source (xapian_path);
        compactor.set_destdir (compact_xapian_path);
        compactor.compact ();
        compactor.add_source (xapian_path);
        compactor.set_destdir (compact_xapian_path);
        compactor.compact ();

-    } catch (Xapian::InvalidArgumentError e) {
-       fprintf (stderr, "Error while compacting: %s\n", e.get_msg().c_str());
+    } catch (const Xapian::Error &error) {
+       fprintf (stderr, "Error while compacting: %s\n", error.get_msg().c_str());

        ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
        goto DONE;
     }
        ret = NOTMUCH_STATUS_XAPIAN_EXCEPTION;
        goto DONE;
     }