Don't throw an exception if we fail to delete a file in the way of restore,

just log the error and return an error code (refs #3)

1 files changed, 5 insertions, 1 deletions

diff --git a/lib/backupclient/BackupClientRestore.cpp b/lib/backupclient/BackupClientRestore.cpp
index baf33002..194c50ad 100644
--- a/lib/backupclient/BackupClientRestore.cpp
+++ b/lib/backupclient/BackupClientRestore.cpp
@@ -263,7 +263,11 @@ static int BackupClientRestoreDir(BackupProtocolClient &rConnection, int64_t Dir
 				::printf("WARNING: File present with name '%s', removing out of the way of restored directory. Use specific restore with ID to restore this object.", rLocalDirectoryName.c_str());
 				if(::unlink(rLocalDirectoryName.c_str()) != 0)
 				{
-					THROW_EXCEPTION(CommonException, OSFileError);
+					::syslog(LOG_ERR, "Failed to delete "
+						"directory %s: %s",
+						rLocalDirectoryName.c_str(),
+						strerror(errno));
+					return Restore_UnknownError;
 				}
 				TRACE1("In restore, directory name collision with file %s", rLocalDirectoryName.c_str());
 			}