From 0e6bb625205231d2802db5636ec352bdb257bc77 Mon Sep 17 00:00:00 2001 From: JonMikelV Date: Wed, 3 Jan 2018 18:18:53 -0600 Subject: [PATCH] Let AddVerboseMessage() handle null / empty args variable & update PurgeFilesHandler to correctly call AddMessage() --- .../Library/Main/Operation/PurgeFilesHandler.cs | 4 ++-- Duplicati/Library/Main/ResultClasses.cs | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Duplicati/Library/Main/Operation/PurgeFilesHandler.cs b/Duplicati/Library/Main/Operation/PurgeFilesHandler.cs index fc91ddb64..416c09a62 100644 --- a/Duplicati/Library/Main/Operation/PurgeFilesHandler.cs +++ b/Duplicati/Library/Main/Operation/PurgeFilesHandler.cs @@ -173,13 +173,13 @@ namespace Duplicati.Library.Main.Operation if (m_options.Dryrun) m_result.AddDryrunMessage(msg); else if (m_options.Verbose) - m_result.AddVerboseMessage(msg); + m_result.AddMessage(msg); } if (m_options.Dryrun) m_result.AddDryrunMessage("Writing files to remote storage"); else if (m_options.Verbose) - m_result.AddVerboseMessage("Writing files to remote storage"); + m_result.AddMessage("Writing files to remote storage"); } if (m_options.Dryrun) diff --git a/Duplicati/Library/Main/ResultClasses.cs b/Duplicati/Library/Main/ResultClasses.cs index 97d7eed70..79fadc9d7 100644 --- a/Duplicati/Library/Main/ResultClasses.cs +++ b/Duplicati/Library/Main/ResultClasses.cs @@ -420,10 +420,13 @@ namespace Duplicati.Library.Main public void AddVerboseMessage(string message, params object[] args) { if (m_parent != null) - m_parent.AddVerboseMessage(message, args); + { + if ((args != null) && (args.Length > 0)) m_parent.AddVerboseMessage(message, args); + else m_parent.AddMessage(message); + } else { - lock(Logging.Log.Lock) + lock (Logging.Log.Lock) { if (m_is_reporting) return; @@ -431,10 +434,13 @@ namespace Duplicati.Library.Main try { m_is_reporting = true; - Logging.Log.WriteMessage(string.Format(message, args), Duplicati.Library.Logging.LogMessageType.Profiling, null); + Logging.Log.WriteMessage((((args != null) || (args.Length > 0)) ? string.Format(message, args) : message), Duplicati.Library.Logging.LogMessageType.Profiling, null); if (MessageSink != null) - MessageSink.VerboseEvent(message, args); + { + if ((args != null) && (args.Length > 0)) MessageSink.VerboseEvent(message, args); + else MessageSink.MessageEvent(message); + } } finally {