- fixed #527
- extended directory check in Uri for local uri/paths
This commit is contained in:
Johannes Schlatow
2010-11-03 10:59:36 +01:00
parent b56b5bc29d
commit 6cb5c7a104
2 changed files with 7 additions and 5 deletions

View File

@@ -126,9 +126,12 @@ std::string Uri::extension () const
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
bool Uri::is_directory () const bool Uri::is_directory () const
{ {
return (path == ".") if (is_local ())
|| (path == "") return Path (this->data).is_directory ();
|| (path[path.length()-1] == '/'); else
return (path == ".")
|| (path == "")
|| (path[path.length()-1] == '/');
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View File

@@ -716,8 +716,7 @@ void handlePull (std::string& outs)
{ {
Directory location (context.config.get ("data.location")); Directory location (context.config.get ("data.location"));
if (! uri.append ("{pending,undo,completed}.data") || if (! uri.append ("{pending,undo,completed}.data"))
! Path (uri.data).is_directory ())
throw std::string ("The uri '") + uri.path + "' is not a local directory."; throw std::string ("The uri '") + uri.path + "' is not a local directory.";
Transport* transport; Transport* transport;