From: Arvin Schnell <aschnell@suse.de>
Date: Wed, 29 Aug 2012 10:30:43 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~138
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=0838bee2c5415d1d6c9616f39c237f10bc08fbfd;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/client/snapper.cc b/client/snapper.cc
index 9bc1d83b..1b504561 100644
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -1271,6 +1271,8 @@ main(int argc, char** argv)
 	    cerr << _("Config is in use.") << endl;
 	else if (name == "error.unknown_file_use")
 	    cerr << _("Unknown file.") << endl;
+	else if (name == "error.io_error")
+	    cerr << _("IO Error.") << endl;
 	else if (name == "error.create_config_failed")
 	    cerr << sformat(_("Creating config failed (%s)."), e.message()) << endl;
 	else if (name == "error.delete_config_failed")
diff --git a/server/Client.cc b/server/Client.cc
index 8532f838..af39732b 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -746,7 +746,7 @@ Client::create_post_snapshot(DBus::Connection& conn, DBus::Message& msg)
     snap2->setUserdata(userdata);
     snap2->flushInfo();
 
-    snapper->startBackgroundComparsion(snap1, snap2); // TODO
+    // snapper->startBackgroundComparsion(snap1, snap2); // TODO
 
     DBus::MessageMethodReturn reply(msg);
 
@@ -1159,6 +1159,11 @@ Client::dispatch(DBus::Connection& conn, DBus::Message& msg)
 	DBus::MessageError reply(msg, "error.invalid_userdata", DBUS_ERROR_FAILED);
 	conn.send(reply);
     }
+    catch (const IOErrorException& e)
+    {
+	DBus::MessageError reply(msg, "error.io_error", DBUS_ERROR_FAILED);
+	conn.send(reply);
+    }
     catch (...)
     {
 	y2err("caught unknown exception");