summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-11-18 23:59:39 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-11-18 23:59:39 -0400
commit8ed7d090ab319bcc45e1593cd2613d38a3615120 (patch)
tree6dab8a87ecd6762846c57dc41224551eae403097
parent295fae20dfed672503ee7e49023febe30e7fee80 (diff)
remove annex/ from key locations used for webdav
-rw-r--r--Locations.hs1
-rw-r--r--Remote/WebDAV.hs2
2 files changed, 2 insertions, 1 deletions
diff --git a/Locations.hs b/Locations.hs
index 6213385bd..db97bbec7 100644
--- a/Locations.hs
+++ b/Locations.hs
@@ -9,6 +9,7 @@ module Locations (
keyFile,
fileKey,
keyPaths,
+ keyPath,
gitAnnexLocation,
annexLocations,
annexLocation,
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index 12f0f55a6..113e59046 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -216,7 +216,7 @@ toDavPass = B8.fromString
{- The location to use to store a Key. -}
davLocation :: DavUrl -> Key -> DavUrl
-davLocation baseurl k = davUrl baseurl $ annexLocation k hashDirLower
+davLocation baseurl k = davUrl baseurl $ keyPath k hashDirLower
davUrl :: DavUrl -> FilePath -> DavUrl
davUrl baseurl file = baseurl </> file