diff options
author | Malte Neumann <m.neumann@prisma-computer.de> | 2014-11-14 16:41:36 +0300 |
---|---|---|
committer | Malte Neumann <m.neumann@prisma-computer.de> | 2014-11-14 16:41:36 +0300 |
commit | 4a57eed9b5a54a82e30079bd85fbccaf1bb3ab8f (patch) | |
tree | 9d8faf12fc6551d1fa17088e5d854a7c34087543 /Duplicati/Library/Backend | |
parent | bb5bb358e7a7c015d6f8942beb5fd95e52b29d60 (diff) |
Fixed a problem with canceled backups
Was an backup canceled, a restart doesn't work. The problem was that a non existing file caused an failure. This fix handles this situation for the ssh and googledocs backend.
Diffstat (limited to 'Duplicati/Library/Backend')
-rw-r--r-- | Duplicati/Library/Backend/GoogleDocs/GoogleDocs.cs | 4 | ||||
-rw-r--r-- | Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Duplicati/Library/Backend/GoogleDocs/GoogleDocs.cs b/Duplicati/Library/Backend/GoogleDocs/GoogleDocs.cs index ca16553ea..8fdadd109 100644 --- a/Duplicati/Library/Backend/GoogleDocs/GoogleDocs.cs +++ b/Duplicati/Library/Backend/GoogleDocs/GoogleDocs.cs @@ -324,6 +324,10 @@ namespace Duplicati.Library.Backend {
throw new Exception(string.Format(Strings.GoogleDocs.CaptchaRequiredError, CAPTCHA_UNLOCK_URL), cex);
}
+ catch (System.IO.FileNotFoundException ex)
+ {
+ throw new FolderMissingException(ex);
+ }
catch
{
//We have no idea if the file was removed or not,
diff --git a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs index 9d5f45b65..ba4963756 100644 --- a/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs +++ b/Duplicati/Library/Backend/SSHv2/SSHv2Backend.cs @@ -23,6 +23,7 @@ using System.Linq; using System.Text;
using Duplicati.Library.Interface;
using Renci.SshNet;
+using Renci.SshNet.Common;
namespace Duplicati.Library.Backend
{
@@ -117,7 +118,15 @@ namespace Duplicati.Library.Backend public void Delete(string remotename)
{
- CreateConnection(true).DeleteFile(remotename);
+ try
+ {
+ CreateConnection(true).DeleteFile(remotename);
+ }
+ catch (SftpPathNotFoundException ex)
+ {
+ throw new FolderMissingException(ex);
+ }
+
}
public IList<ICommandLineArgument> SupportedCommands
|