rpmtrans: log currently processing package from rpm (RhBug:1305232)

Requires rpm-software-management/rpm@124ed29.

References: https://bugzilla.redhat.com/show_bug.cgi?id=1305232
Signed-off-by: Igor Gnatenko <[email protected]>

Closes: rpm-software-management#857
Approved by: j-mracek

Author: mluscon

dnf.spec

@@ -1,7 +1,7 @@
 %global hawkey_version 0.12.1
 %global librepo_version 1.7.19
 %global libcomps_version 0.1.8
-%global rpm_version 4.13.0-0.rc1.29
+%global rpm_version 4.14.0
 %global min_plugins_core 2.1.3
 %global dnf_langpacks_ver 0.15.1-6
 

dnf/yum/rpmtrans.py

@@ -148,14 +148,21 @@ def error(self, message):
     def filelog(self, package, action):
         # If the action is not in the fileaction list then dump it as a string
         # hurky but, sadly, not much else
-        process = self.fileaction[action]
-        if process is None:
-            return
-        msg = '%s: %s' % (process, package)
+        if not dnf.util.is_string_type(action):
+            action = self.fileaction[action]
+            if action is None:
+                return
+        msg = '%s: %s' % (action, package)
         self.rpm_logger.info(msg)
 
 class RPMTransaction(object):
     def __init__(self, base, test=False, displays=()):
+        self.ts_action = {TransactionDisplay.PKG_DOWNGRADE: 'Downgrading',
+                          TransactionDisplay.PKG_ERASE: 'Erasing',
+                          TransactionDisplay.PKG_INSTALL: 'Installing',
+                          TransactionDisplay.PKG_REINSTALL: 'Reinstalling',
+                          TransactionDisplay.PKG_UPGRADE: 'Upgrading'}
+
         if not displays:
             displays = [ErrorTransactionDisplay()]
         self.displays = displays
@@ -263,7 +270,7 @@ def callback(self, what, amount, total, key, client_data):
                 # This callback type is issued every time the next transaction
                 # element is about to be processed by RPM, before any other
                 # callbacks are issued.  "amount" carries the index of the element.
-                self._elemProgress(amount)
+                self._elemProgress(key, amount)
             elif what == rpm.RPMCALLBACK_INST_OPEN_FILE:
                 return self._instOpenFile(key)
             elif what == rpm.RPMCALLBACK_INST_CLOSE_FILE:
@@ -302,9 +309,14 @@ def _trans_progress(self, amount, total):
         for display in self.displays:
             display.progress('', action, amount + 1, total, 1, 1)
 
-    def _elemProgress(self, index):
+    def _elemProgress(self, key, index):
         self._te_index = index
         self.complete_actions += 1
+        if not self.test:
+            pkg, state, tsi = self._extract_cbkey(key)
+            action = TransactionDisplay.ACTION_FROM_OP_TYPE[tsi.op_type]
+            for display in self.displays:
+                display.filelog(pkg, self.ts_action[action])
 
     def _instOpenFile(self, key):
         self.lastmsg = None