From 1642cf9d6a59b0784daba701a5a66a8fbe8a5125 Mon Sep 17 00:00:00 2001
From: Jaroslav Rohel <jrohel@redhat.com>
Date: Mon, 2 Dec 2019 08:16:47 +0100
Subject: [PATCH] Fix: Don't print lines with (null) in transaction report
(RhBug:1691353)
Example:
Installing: binutils;2.30-49.el8;x86_64;beaker-BaseOS
Installing: (null)
Installing: isl;0.16.1-6.el8;x86_64;beaker-AppStream
Installing: (null)
The lines with (null) will not be printed with this patch.
---
dnf/dnf-main.c | 27 +++++++++++++++++----------
1 file changed, 17 insertions(+), 10 deletions(-)
diff --git a/dnf/dnf-main.c b/dnf/dnf-main.c
index 4f19489..542ef61 100644
--- a/dnf/dnf-main.c
+++ b/dnf/dnf-main.c
@@ -121,38 +121,45 @@ state_action_changed_cb (DnfState *state,
switch (action)
{
case DNF_STATE_ACTION_DOWNLOAD_METADATA:
- g_print("Downloading metadata...\n");
+ g_print ("Downloading metadata...\n");
break;
case DNF_STATE_ACTION_DOWNLOAD_PACKAGES:
if (!dl_pkgs_printed)
{
- g_print("Downloading packages...\n");
+ g_print ("Downloading packages...\n");
dl_pkgs_printed = TRUE;
}
break;
case DNF_STATE_ACTION_TEST_COMMIT:
- g_print("Running transaction test...\n");
+ g_print ("Running transaction test...\n");
break;
case DNF_STATE_ACTION_INSTALL:
- g_print("Installing: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Installing: %s\n", action_hint);
break;
case DNF_STATE_ACTION_REMOVE:
- g_print("Removing: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Removing: %s\n", action_hint);
break;
case DNF_STATE_ACTION_UPDATE:
- g_print("Updating: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Updating: %s\n", action_hint);
break;
case DNF_STATE_ACTION_OBSOLETE:
- g_print("Obsoleting: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Obsoleting: %s\n", action_hint);
break;
case DNF_STATE_ACTION_REINSTALL:
- g_print("Reinstalling: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Reinstalling: %s\n", action_hint);
break;
case DNF_STATE_ACTION_DOWNGRADE:
- g_print("Downgrading: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Downgrading: %s\n", action_hint);
break;
case DNF_STATE_ACTION_CLEANUP:
- g_print("Cleanup: %s\n", action_hint);
+ if (action_hint)
+ g_print ("Cleanup: %s\n", action_hint);
break;
default:
break;