r3138 - software/ui/src

[Enrico Zini]

Author: enrico
Date: 2007-06-29 16:21:39 +0000 (Fri, 29 Jun 2007)
New Revision: 3138

Modified:
   software/ui/src/games.cpp
Log:
Better handling of xapian exceptions

Modified: software/ui/src/games.cpp
===================================================================
--- software/ui/src/games.cpp	2007-06-29 16:04:27 UTC (rev 3137)
+++ software/ui/src/games.cpp	2007-06-29 16:21:39 UTC (rev 3138)
@@ -326,7 +326,21 @@
 	} catch (std::exception& e) {
 		cerr << e.what() << endl;
 		return 1;
+	} catch (Xapian::DatabaseVersionError& e) {
+		cerr << "Xapian " << e.get_type() << ": " << e.get_msg();
+		if (!e.get_context().empty())
+			cerr << ". Context: " << e.get_context();
+		cerr << endl;
+		cerr << endl;
+		cerr << "Please recreate the database by removing /var/lib/apt-xapian and running ept-cache reindex as root." << endl;
+	} catch (Xapian::Error& e) {
+		cerr << "Xapian " << e.get_type() << ": " << e.get_msg();
+		if (!e.get_context().empty())
+			cerr << ". Context: " << e.get_context();
+		cerr << endl;
+		return 1;
 	}
+
 }
 
 #include <ept/debtags/debtags.tcc>