summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-30 19:33:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-30 19:33:43 -0400
commit95f30f07830ddefc27a9cccb3dac97898e47e78b (patch)
tree4d184e49fc293446aa81d972a69575e7203d5476 /Command
parentde6a7a7ebbba3e8f517d038cf53949ab5bb7a575 (diff)
thaw content directory in direct mode too
A content directory can be frozen in direct mode. One way this can happen is if the content is transferred before direct mode has a mapping for it, so it's stored in the content directory. So, we need to thaw the content directory before doing things with it.
Diffstat (limited to 'Command')
-rw-r--r--Command/Indirect.hs2
1 files changed, 2 insertions, 0 deletions
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 59972a66b..668bebefb 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -18,6 +18,7 @@ import Annex.Direct
import Annex.Content
import Annex.CatFile
import Annex.Version
+import Annex.Perms
import Init
def :: [Command]
@@ -80,6 +81,7 @@ perform = do
fromdirect f k = do
showStart "indirect" f
+ thawContentDir =<< calcRepo (gitAnnexLocation k)
cleandirect k -- clean before content directory gets frozen
whenM (liftIO $ not . isSymbolicLink <$> getSymbolicLinkStatus f) $ do
moveAnnex k f