mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

refactor

Browse source
This commit is contained in:
Joey Hess 2013-04-30 19:09:36 -04:00
parent 7c73b7584d
commit 11ca4cee34
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Annex/Content.hs
View file

@ -353,8 +353,7 @@ removeAnnex :: Key -> Annex ()
removeAnnex key = withObjectLoc key remove removedirect
where
remove file = do
unlessM crippledFileSystem $
liftIO $ allowWrite $ parentDir file
thawContentDir file
liftIO $ nukeFile file
removeInodeCache key
cleanObjectLoc key
@ -374,8 +373,7 @@ removeAnnex key = withObjectLoc key remove removedirect
fromAnnex :: Key -> FilePath -> Annex ()
fromAnnex key dest = do
file <- calcRepo $ gitAnnexLocation key
unlessM crippledFileSystem $
liftIO $ allowWrite $ parentDir file
thawContentDir file
thawContent file
liftIO $ moveFile file dest
cleanObjectLoc key
@ -388,8 +386,7 @@ moveBad key = do
bad <- fromRepo gitAnnexBadDir
let dest = bad </> takeFileName src
createAnnexDirectory (parentDir dest)
unlessM crippledFileSystem $
liftIO $ allowWrite (parentDir src)
thawContentDir src
liftIO $ moveFile src dest
cleanObjectLoc key
logStatus key InfoMissing