Fix history rollback command does not meet the expected result

rpm-software-management · Jan 30, 2024 · e3a37a1 · e3a37a1
1 parent 0e40047
commit e3a37a1
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/dnf/cli/commands/history.py b/dnf/cli/commands/history.py
@@ -209,21 +209,26 @@ def _hcmd_rollback(self, extcmds):
                 else:
                     merged_trans.merge(trans)
 
+        tm = dnf.util.normalize_time(old.beg_timestamp)
+        print("Rollback to transaction %u, from %s" % (old.tid, tm))
+        print(self.output.fmtKeyValFill("  Undoing the following transactions: ",
+                                        ", ".join((str(x) for x in merged_trans.tids()))))
+        self.output.historyInfoCmdPkgsAltered(merged_trans)
         self._revert_transaction(merged_trans)
 
     def _revert_transaction(self, trans):
         action_map = {
             "Install": "Removed",
             "Removed": "Install",
-            "Upgrade": "Downgraded",
+            "Upgrade": None,
             "Upgraded": "Downgrade",
-            "Downgrade": "Upgraded",
+            "Downgrade": None,
             "Downgraded": "Upgrade",
-            "Reinstalled": "Reinstall",
-            "Reinstall": "Reinstalled",
+            "Reinstalled": None,
+            "Reinstall": None,
             "Obsoleted": "Install",
-            "Obsolete": "Obsoleted",
-            "Reason Change": "Reason Change",
+            "Obsolete": None,
+            "Reason Change": None,
         }
 
         data = serialize_transaction(trans)

diff --git a/dnf/transaction_sr.py b/dnf/transaction_sr.py
@@ -536,13 +536,18 @@ def run(self):
 
         for pkg_data in self._rpms:
             try:
+                action = pkg_data["action"]
+                if action is None:
+                    continue
                 self._replay_pkg_action(pkg_data)
             except TransactionError as e:
                 errors.append(e)
 
         for group_data in self._groups:
             try:
                 action = group_data["action"]
+                if action is None:
+                    continue
                 group_id = group_data["id"]
 
                 try:
@@ -576,6 +581,8 @@ def run(self):
         for env_data in self._environments:
             try:
                 action = env_data["action"]
+                if action is None:
+                    continue
                 env_id = env_data["id"]
 
                 try: