daemon: Reset the goal

dnf5daemon-server/dbus/interfaces/org.rpm.dnf.v0.Goal.xml

@@ -106,6 +106,13 @@ along with libdnf. If not, see <https://www.gnu.org/licenses/>.
  <arg name="error_msg" type="s" direction="out" />
  </method>
 
+ <!--
+ reset:
+ Reset the prepared rpm transaction. After this call the session is ready to perform another rpm transaction.
+ -->
+ <method name="reset">
+ </method>
+
 </interface>
 
 </node>

dnf5daemon-server/services/goal/goal.cpp

@@ -114,6 +114,10 @@ void Goal::dbus_register() {
  [this](sdbus::MethodCall call) -> void {
  session.get_threads_manager().handle_method(*this, &Goal::cancel, call, session.session_locale);
  });
+ dbus_object->registerMethod(
+ dnfdaemon::INTERFACE_GOAL, "reset", "", {}, "", {}, [this](sdbus::MethodCall call) -> void {
+ session.get_threads_manager().handle_method(*this, &Goal::reset, call, session.session_locale);
+ });
 }
 
 sdbus::MethodReply Goal::resolve(sdbus::MethodCall & call) {
@@ -346,3 +350,9 @@ sdbus::MethodReply Goal::cancel(sdbus::MethodCall & call) {
  reply << error_msg;
  return reply;
 }
+
+sdbus::MethodReply Goal::reset(sdbus::MethodCall & call) {
+ session.reset_goal();
+ auto reply = call.createReply();
+ return reply;
+}

dnf5daemon-server/services/goal/goal.hpp

@@ -37,6 +37,7 @@ class Goal : public IDbusSessionService {
  sdbus::MethodReply get_transaction_problems(sdbus::MethodCall & call);
  sdbus::MethodReply do_transaction(sdbus::MethodCall & call);
  sdbus::MethodReply cancel(sdbus::MethodCall & call);
+ sdbus::MethodReply reset(sdbus::MethodCall & call);
 };
 
 #endif

dnf5daemon-server/session.cpp

@@ -377,3 +377,8 @@ void Session::store_transaction_offline() {
 
  state.write();
 }
+
+void Session::reset_goal() {
+ transaction.reset(nullptr);
+ goal.reset();
+}

dnf5daemon-server/session.hpp

@@ -99,6 +99,8 @@ class Session {
  /// Setter for download cancel request flag.
  void set_cancel_download(CancelDownload value) { cancel_download.store(value); }
 
+ void reset_goal();
+
 private:
  sdbus::IConnection & connection;
  std::unique_ptr<libdnf5::Base> base;

libdnf5/base/goal.cpp

@@ -3296,12 +3296,17 @@ void Goal::add_redo_transaction(
 void Goal::reset() {
  p_impl->module_specs.clear();
  p_impl->rpm_specs.clear();
+ p_impl->rpm_reason_change_specs.clear();
  p_impl->rpm_ids.clear();
  p_impl->group_specs.clear();
  p_impl->rpm_filepaths.clear();
  p_impl->resolved_group_specs.clear();
  p_impl->resolved_environment_specs.clear();
+ p_impl->group_specs.clear();
  p_impl->rpm_goal = rpm::solv::GoalPrivate(p_impl->base);
+ p_impl->serialized_transaction.reset();
+ p_impl->revert_transactions.reset();
+ p_impl->redo_transaction.reset();
 }
 
 BaseWeakPtr Goal::get_base() const {