summaryrefslogtreecommitdiff
path: root/Backend/URL.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 19:00:01 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-01-06 19:00:01 -0400
commit6be8289158fd30d972ac22766452e7c9dc809e6f (patch)
treeba4929c7c8f27d2b43051f637394115cda39258b /Backend/URL.hs
parent6ea1214fa5d19241851a977ab82437563e2afc81 (diff)
parent971ed2a464a1a1e4d5e650e32390d232cd354d9d (diff)
Merge branch 'master' into relativepaths
Conflicts: Locations.hs debian/changelog
Diffstat (limited to 'Backend/URL.hs')
-rw-r--r--Backend/URL.hs12
1 files changed, 5 insertions, 7 deletions
diff --git a/Backend/URL.hs b/Backend/URL.hs
index 2c2988ac0..ac517a5f3 100644
--- a/Backend/URL.hs
+++ b/Backend/URL.hs
@@ -32,10 +32,8 @@ backend = Backend
{- Every unique url has a corresponding key. -}
fromUrl :: String -> Maybe Integer -> Annex Key
-fromUrl url size = do
- n <- genKeyName url
- return $ stubKey
- { keyName = n
- , keyBackendName = "URL"
- , keySize = size
- }
+fromUrl url size = return $ stubKey
+ { keyName = genKeyName url
+ , keyBackendName = "URL"
+ , keySize = size
+ }