Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/duplicati/duplicati.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'Duplicati')
-rw-r--r--Duplicati/Library/Backend/Rclone/Rclone.cs6
-rw-r--r--Duplicati/Library/Backend/SharePoint/SharePointBackend.cs2
-rw-r--r--Duplicati/Library/Logging/LogEntry.cs4
-rw-r--r--Duplicati/Server/WebServer/RESTMethods/Help.cs4
4 files changed, 8 insertions, 8 deletions
diff --git a/Duplicati/Library/Backend/Rclone/Rclone.cs b/Duplicati/Library/Backend/Rclone/Rclone.cs
index b16b48a0f..a11f7bbc7 100644
--- a/Duplicati/Library/Backend/Rclone/Rclone.cs
+++ b/Duplicati/Library/Backend/Rclone/Rclone.cs
@@ -172,13 +172,13 @@ namespace Duplicati.Library.Backend
if (errorBuilder.ToString().Contains(RCLONE_ERROR_CONFIG_NOT_FOUND))
{
- throw new Exception(String.Format("Missing config file? {0}", errorBuilder.ToString()));
+ throw new Exception(String.Format("Missing config file? {0}", errorBuilder));
}
if (errorBuilder.Length > 0) {
throw new Exception(errorBuilder.ToString());
}
- Console.Error.WriteLine(errorBuilder.ToString());
+ Console.Error.WriteLine(errorBuilder);
return outputBuilder.ToString();
}
@@ -208,7 +208,7 @@ namespace Duplicati.Library.Backend
foreach (JObject item in array)
{
#if DEBUG
- Console.Error.WriteLine(item.ToString());
+ Console.Error.WriteLine(item);
#endif
FileEntry fe = new FileEntry(
item.GetValue("Name").Value<string>(),
diff --git a/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs b/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs
index cef7ba6dd..2e0bad9c3 100644
--- a/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs
+++ b/Duplicati/Library/Backend/SharePoint/SharePointBackend.cs
@@ -431,7 +431,7 @@ namespace Duplicati.Library.Backend
{
var req = m_parent.CreateWebRequestExecutor(context, requestUrl);
if (string.IsNullOrWhiteSpace(req.WebRequest.UserAgent))
- req.WebRequest.UserAgent = "Duplicati OD4B v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version.ToString();
+ req.WebRequest.UserAgent = "Duplicati OD4B v" + System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
return req;
}
}
diff --git a/Duplicati/Library/Logging/LogEntry.cs b/Duplicati/Library/Logging/LogEntry.cs
index 32cd22fad..a5d7cdfef 100644
--- a/Duplicati/Library/Logging/LogEntry.cs
+++ b/Duplicati/Library/Logging/LogEntry.cs
@@ -171,9 +171,9 @@ namespace Duplicati.Library.Logging
/// <param name="withExceptionDetails">If set to <c>true</c> the result has expanded exception details.</param>
public string AsString(bool withExceptionDetails)
{
- return this.ToString() +
+ return this +
((withExceptionDetails && Exception != null)
- ? Environment.NewLine + Exception.ToString()
+ ? Environment.NewLine + Exception
: string.Empty);
}
}
diff --git a/Duplicati/Server/WebServer/RESTMethods/Help.cs b/Duplicati/Server/WebServer/RESTMethods/Help.cs
index e96a03c18..f940bedb7 100644
--- a/Duplicati/Server/WebServer/RESTMethods/Help.cs
+++ b/Duplicati/Server/WebServer/RESTMethods/Help.cs
@@ -41,7 +41,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
}
- var data = Encoding.UTF8.GetBytes(string.Format(TEMPLATE, "API Information", "", sb.ToString()));
+ var data = Encoding.UTF8.GetBytes(string.Format(TEMPLATE, "API Information", "", sb));
info.Response.ContentType = "text/html";
info.Response.ContentLength = data.Length;
@@ -68,7 +68,7 @@ namespace Duplicati.Server.WebServer.RESTMethods
sb.AppendFormat(METHOD_TEMPLATE, t.Key, JsonConvert.SerializeObject(t.Value)); //TODO: Format the type
}
- var data = Encoding.UTF8.GetBytes(string.Format(TEMPLATE, m.GetType().Name, desc, sb.ToString()));
+ var data = Encoding.UTF8.GetBytes(string.Format(TEMPLATE, m.GetType().Name, desc, sb));
info.Response.ContentType = "text/html";
info.Response.ContentLength = data.Length;