summaryrefslogtreecommitdiff
path: root/Annex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-13 03:41:12 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-13 03:41:12 -0400
commit99b2029236248f6b4ce68e126b70fa0855fac37f (patch)
tree74e373992ecfac6543245f4ab9f86bf54fdf8d11 /Annex.hs
parentcc5cf0093ea1aacc4c5460dfdd4d35f2963687bd (diff)
key conversion back from file bugfixes
Diffstat (limited to 'Annex.hs')
-rw-r--r--Annex.hs6
1 files changed, 2 insertions, 4 deletions
diff --git a/Annex.hs b/Annex.hs
index 7cee3c4cb..936e62502 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -87,10 +87,8 @@ annexFile state file = inBackend file err $ do
{- Inverse of annexFile. -}
unannexFile :: State -> FilePath -> IO ()
unannexFile state file = notinBackend file err $ \(key, backend) -> do
- dropped <- dropFile state backend key
- if (not dropped)
- then error $ "backend refused to drop " ++ file
- else cleanup key backend
+ dropFile state backend key
+ cleanup key backend
where
err = error $ "not annexed " ++ file
cleanup key backend = do