Blame 0024-mailx-print-only-one-log-message-in-notify_only-mode.patch

Jakub Filak 5598e9c
From 8cc3a91e7f07365d760d8716067ba03bb0d53aa7 Mon Sep 17 00:00:00 2001
Jakub Filak 5598e9c
From: Jakub Filak <jfilak@redhat.com>
Jakub Filak 5598e9c
Date: Wed, 27 Aug 2014 09:07:54 +0200
Jakub Filak 5598e9c
Subject: [PATCH 24/33] mailx: print only one log message in notify_only mode
Jakub Filak 5598e9c
Jakub Filak 5598e9c
Related to rhbz#1133674
Jakub Filak 5598e9c
Jakub Filak 5598e9c
Signed-off-by: Jakub Filak <jfilak@redhat.com>
Jakub Filak 5598e9c
---
Jakub Filak 5598e9c
 src/plugins/reporter-mailx.c | 9 +++++++--
Jakub Filak 5598e9c
 1 file changed, 7 insertions(+), 2 deletions(-)
Jakub Filak 5598e9c
Jakub Filak 5598e9c
diff --git a/src/plugins/reporter-mailx.c b/src/plugins/reporter-mailx.c
Jakub Filak 5598e9c
index 92e78a4..caacbe8 100644
Jakub Filak 5598e9c
--- a/src/plugins/reporter-mailx.c
Jakub Filak 5598e9c
+++ b/src/plugins/reporter-mailx.c
Jakub Filak 5598e9c
@@ -132,7 +132,11 @@ static void create_and_send_email(
Jakub Filak 5598e9c
      */
Jakub Filak 5598e9c
     putenv((char*)"sendwait=1");
Jakub Filak 5598e9c
 
Jakub Filak 5598e9c
-    log(_("Sending an email..."));
Jakub Filak 5598e9c
+    if (notify_only)
Jakub Filak 5598e9c
+        log(_("Sending a notification email to: %s"), email_to);
Jakub Filak 5598e9c
+    else
Jakub Filak 5598e9c
+        log(_("Sending an email..."));
Jakub Filak 5598e9c
+
Jakub Filak 5598e9c
     exec_and_feed_input(dsc, args);
Jakub Filak 5598e9c
 
Jakub Filak 5598e9c
     free(dsc);
Jakub Filak 5598e9c
@@ -154,8 +158,9 @@ static void create_and_send_email(
Jakub Filak 5598e9c
             free(msg);
Jakub Filak 5598e9c
             dd_close(dd);
Jakub Filak 5598e9c
         }
Jakub Filak 5598e9c
+        log(_("Email was sent to: %s"), email_to);
Jakub Filak 5598e9c
     }
Jakub Filak 5598e9c
-    log(_("Email was sent to: %s"), email_to);
Jakub Filak 5598e9c
+
Jakub Filak 5598e9c
     free(email_to);
Jakub Filak 5598e9c
 }
Jakub Filak 5598e9c
 
Jakub Filak 5598e9c
-- 
Jakub Filak 5598e9c
2.1.0
Jakub Filak 5598e9c