From: Arvin Schnell <aschnell@suse.de>
Date: Fri, 3 Aug 2012 08:43:32 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~172
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=539f3da8a80ccc6474407fd02bb3350fa8cb6eba;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/server/Client.cc b/server/Client.cc
index 0ee339ed..456d87c1 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -1272,6 +1272,10 @@ Client::dispatch(DBus::Connection& conn, DBus::Message& msg)
 	    conn.send(reply);
 	}
     }
+    catch (const boost::thread_interrupted&)
+    {
+	throw;
+    }
     catch (const DBus::MarshallingException& e)
     {
 	DBus::MessageError reply(msg, "error.dbus.marshalling", DBUS_ERROR_FAILED);
@@ -1324,6 +1328,7 @@ Client::dispatch(DBus::Connection& conn, DBus::Message& msg)
     }
     catch (...)
     {
+	y2err("caught unknown exception");
 	DBus::MessageError reply(msg, "error.something", DBUS_ERROR_FAILED);
 	conn.send(reply);
     }
@@ -1366,6 +1371,7 @@ Client::worker()
     }
     catch (const boost::thread_interrupted&)
     {
+	y2mil("worker interrupted");
     }
 }
 
diff --git a/snapper/Compare.cc b/snapper/Compare.cc
index c2b13f44..b6979da7 100644
--- a/snapper/Compare.cc
+++ b/snapper/Compare.cc
@@ -29,6 +29,7 @@
 #include <errno.h>
 #include <vector>
 #include <algorithm>
+#include <boost/thread.hpp>
 
 #include "snapper/Log.h"
 #include "snapper/AppUtil.h"
@@ -398,6 +399,8 @@ namespace snapper
 
 	while (first1 != last1 || first2 != last2)
 	{
+	    boost::this_thread::interruption_point();
+
 	    if (first1 == last1)
 	    {
 		if (first2->stat.st_dev == cmp_data.dev2)