From 19a89753ca20b269a131e747238925cce254c627 Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Wed, 13 Nov 2013 19:02:44 +0200 Subject: [PATCH] compact: catch Xapian::Error consistently catch Xapian::Error in compact code in lib/database.cc to be consistent with other code in addition to not making software crash on uncaught other Xapian error. --- lib/database.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/database.cc b/lib/database.cc index 3c008d68..3530cb65 100644 --- 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 (); - } 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; } -- 2.26.2