GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

9
src/Uri.cpp
View file

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

3
src/command.cpp
View file

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