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.
This commit is contained in:
parent
1111552efd
commit
0807211a67
3 changed files with 6 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue