- work on dbus interface

diff --git a/client/snapper.cc b/client/snapper.cc
index b64b5f2920fd792de48f9e1d33cd47f389f96642..992c3b7dc204b4b935603ab6b9270e51507682cb 100644 (file)
--- 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 2c28ac8d5609181d7c38cfd1527ec2e7c840487f..39b06e2677c908eb8ec6a0859c103f1c15d43d8a 100644 (file)
--- 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 bc5d7248a410425f235ebb3d8aa3ac3de58cb48b..e78548a29c91b3758d01906171753acbc016b1c8 100644 (file)
--- 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);