From a38fe4c0ffe0cf0643b37e5520072e2f4674e687 Mon Sep 17 00:00:00 2001 From: Arvin Schnell Date: Mon, 3 Mar 2014 17:23:15 +0100 Subject: [PATCH] - fixed empty-pre-post cleanup algorithm --- client/cleanup.cc | 2 ++ client/commands.cc | 13 +++++++++++++ client/commands.h | 4 ++++ package/snapper.changes | 5 +++++ 4 files changed, 24 insertions(+) diff --git a/client/cleanup.cc b/client/cleanup.cc index 875fe796..cd48e70d 100644 --- a/client/cleanup.cc +++ b/client/cleanup.cc @@ -362,6 +362,8 @@ do_cleanup_empty_pre_post(DBus::Connection& conn, const string& config_name) tmp.push_back(it1); tmp.push_back(it2); } + + command_delete_xcomparison(conn, config_name, it1->getNum(), it2->getNum()); } } } diff --git a/client/commands.cc b/client/commands.cc index 8123f305..d849cd49 100644 --- a/client/commands.cc +++ b/client/commands.cc @@ -294,6 +294,19 @@ command_create_xcomparison(DBus::Connection& conn, const string& config_name, un } +void +command_delete_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1, + unsigned int number2) +{ + DBus::MessageMethodCall call(SERVICE, OBJECT, INTERFACE, "DeleteComparison"); + + DBus::Hoho hoho(call); + hoho << config_name << number1 << number2; + + conn.send_with_reply_and_block(call); +} + + list command_get_xfiles(DBus::Connection& conn, const string& config_name, unsigned int number1, unsigned int number2) diff --git a/client/commands.h b/client/commands.h index 51d1319b..dfc29a66 100644 --- a/client/commands.h +++ b/client/commands.h @@ -95,6 +95,10 @@ void command_create_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1, unsigned int number2); +void +command_delete_xcomparison(DBus::Connection& conn, const string& config_name, unsigned int number1, + unsigned int number2); + list command_get_xfiles(DBus::Connection& conn, const string& config_name, unsigned int number1, unsigned int number2); diff --git a/package/snapper.changes b/package/snapper.changes index d2ab78c4..2c7fb1ee 100644 --- a/package/snapper.changes +++ b/package/snapper.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 03 17:20:41 CET 2014 - aschnell@suse.de + +- fixed empty-pre-post cleanup algorithm + ------------------------------------------------------------------- Fri Feb 28 11:47:22 CET 2014 - aschnell@suse.de -- 2.47.3