From 42521fea8b59e12fc80eae8fc1b92ce4ac174b6a Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Wed, 6 Oct 2010 23:54:15 -0400 Subject: [PATCH] Sync - Managed to cut/paste a superfluous semicolon. Oops. --- src/TransportCurl.cpp | 4 ++-- src/TransportRSYNC.cpp | 4 ++-- src/TransportSSH.cpp | 4 ++-- src/command.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/TransportCurl.cpp b/src/TransportCurl.cpp index f587484cf..ea09884ed 100644 --- a/src/TransportCurl.cpp +++ b/src/TransportCurl.cpp @@ -50,7 +50,7 @@ void TransportCurl::send(const std::string& source) throw std::string ("When using the 'curl' protocol, wildcards are not supported."); if (!uri.is_directory()) - throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory."; + throw std::string ("The uri '") + uri.path + "' does not appear to be a directory."; std::string toSplit; std::string suffix; @@ -105,7 +105,7 @@ void TransportCurl::recv(std::string target) throw std::string ("When using the 'curl' protocol, wildcards are not supported."); if (!is_directory(target)) - throw std::string ("The uri '"); + target + "' does not appear to be a directory."; + throw std::string ("The uri '") + target + "' does not appear to be a directory."; std::string toSplit; std::string suffix; diff --git a/src/TransportRSYNC.cpp b/src/TransportRSYNC.cpp index 26003fdd9..1963ad5fc 100644 --- a/src/TransportRSYNC.cpp +++ b/src/TransportRSYNC.cpp @@ -42,7 +42,7 @@ void TransportRSYNC::send(const std::string& source) // Is there more than one file to transfer? // Then path has to end with a '/' if (is_filelist(source) && !uri.is_directory()) - throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory."; + throw std::string ("The uri '") + uri.path + "' does not appear to be a directory."; // cmd line is: rsync [--port=PORT] source [user@]host::path if (uri.port != "") @@ -74,7 +74,7 @@ void TransportRSYNC::recv(std::string target) // Is there more than one file to transfer? // Then target has to end with a '/' if (is_filelist(uri.path) && !is_directory(target)) - throw std::string ("The uri '"); + target + "' does not appear to be a directory."; + throw std::string ("The uri '") + target + "' does not appear to be a directory."; // cmd line is: rsync [--port=PORT] [user@]host::path target if (uri.port != "") diff --git a/src/TransportSSH.cpp b/src/TransportSSH.cpp index 64be238e0..34421ee2c 100644 --- a/src/TransportSSH.cpp +++ b/src/TransportSSH.cpp @@ -42,7 +42,7 @@ void TransportSSH::send(const std::string& source) // Is there more than one file to transfer? // Then path has to end with a '/' if (is_filelist(source) && !uri.is_directory()) - throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory."; + throw std::string ("The uri '") + uri.path + "' does not appear to be a directory."; // cmd line is: scp [-p port] [user@]host:path if (uri.port != "") @@ -75,7 +75,7 @@ void TransportSSH::recv(std::string target) // Is there more than one file to transfer? // Then target has to end with a '/' if (is_filelist(uri.path) && !is_directory(target)) - throw std::string ("The uri '"); + target + "' does not appear to be a directory."; + throw std::string ("The uri '") + target + "' does not appear to be a directory."; // cmd line is: scp [-p port] [user@]host:path if (uri.port != "") diff --git a/src/command.cpp b/src/command.cpp index 59c0af6f3..48ce4262c 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -665,7 +665,7 @@ void handlePush (std::string& outs) { // copy files locally if (!uri.is_directory()) - throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory."; + throw std::string ("The uri '") + uri.path + "' does not appear to be a directory."; std::ifstream ifile1 ((location.data + "/undo.data").c_str(), std::ios_base::binary); std::ofstream ofile1 ((uri.path + "undo.data").c_str(), std::ios_base::binary); @@ -704,7 +704,7 @@ void handlePull (std::string& outs) Directory location (context.config.get ("data.location")); if (!uri.append ("{pending,undo,completed}.data")) - throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory."; + throw std::string ("The uri '") + uri.path + "' does not appear to be a directory."; Transport* transport; if ((transport = Transport::getTransport (uri)) != NULL)