From: Arvin Schnell <aschnell@suse.de>
Date: Mon, 6 Aug 2012 14:22:13 +0000 (+0200)
Subject: - work on dbus interface
X-Git-Tag: v0.1.3~164
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=a4a997fe76a2dcf987c91eb99c76d598fb90c7ed;p=thirdparty%2Fsnapper.git

- work on dbus interface
---

diff --git a/client/snapper.cc b/client/snapper.cc
index b64b5f29..992c3b7d 100644
--- a/client/snapper.cc
+++ b/client/snapper.cc
@@ -1201,6 +1201,10 @@ 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.create_config_failed")
+	    cerr << sformat(_("Creating config failed (%s)."), e.message()) << endl;
+	else if (name == "error.delete_config_failed")
+	    cerr << sformat(_("Deleting config failed (%s)."), e.message()) << endl;
 	else
 	    cerr << _("Failure") << " (" << name << ")." << endl;
 	exit(EXIT_FAILURE);
diff --git a/server/Client.cc b/server/Client.cc
index 2c28ac8d..39b06e26 100644
--- a/server/Client.cc
+++ b/server/Client.cc
@@ -1339,6 +1339,16 @@ Client::dispatch(DBus::Connection& conn, DBus::Message& msg)
 	DBus::MessageError reply(msg, "error.unknown_config", DBUS_ERROR_FAILED);
 	conn.send(reply);
     }
+    catch (const CreateConfigFailedException& e)
+    {
+	DBus::MessageError reply(msg, "error.create_config_failed", e.what());
+	conn.send(reply);
+    }
+    catch (const DeleteConfigFailedException& e)
+    {
+	DBus::MessageError reply(msg, "error.delete_config_failed", e.what());
+	conn.send(reply);
+    }
     catch (const Permissions& e)
     {
 	DBus::MessageError reply(msg, "error.no_permissions", DBUS_ERROR_FAILED);
diff --git a/server/MetaSnapper.cc b/server/MetaSnapper.cc
index bc5d7248..e78548a2 100644
--- a/server/MetaSnapper.cc
+++ b/server/MetaSnapper.cc
@@ -268,8 +268,6 @@ void
 MetaSnappers::createConfig(const string& config_name, const string& subvolume,
 			   const string& fstype, const string& template_name)
 {
-    // TODO checks
-
     Snapper::createConfig(config_name, subvolume, fstype, template_name);
 
     ConfigInfo config_info = Snapper::getConfig(config_name);