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

Revert "avoid using MissingH's HVFS layer"

Browse source 
This reverts commit 0700fbc477.

This broke unit and test suite cleanup. The difference is that
dirContentsRecursive only returns files, but this needs to also operate on
directories.
This commit is contained in:
Joey Hess 2015-01-28 17:40:26 -04:00
parent b0575c621f
commit 10af77d657
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Command/Uninit.hs
View file

@ -18,6 +18,9 @@ import Annex.Content
import Annex.Init import Annex.Init
import Utility.FileMode import Utility.FileMode
import System.IO.HVFS
import System.IO.HVFS.Utils
cmd :: [Command] cmd :: [Command]
cmd = [addCheck check $ command "uninit" paramPaths seek cmd = [addCheck check $ command "uninit" paramPaths seek
SectionUtility "de-initialize git-annex and clean out repository"] SectionUtility "de-initialize git-annex and clean out repository"]
@ -88,7 +91,7 @@ finish = do
- preparation for removal. -} - preparation for removal. -}
prepareRemoveAnnexDir :: FilePath -> IO () prepareRemoveAnnexDir :: FilePath -> IO ()
prepareRemoveAnnexDir annexdir = prepareRemoveAnnexDir annexdir =
mapM_ (void . tryIO . allowWrite) =<< dirContentsRecursive annexdir recurseDir SystemFS annexdir >>= mapM_ (void . tryIO . allowWrite)
{- Keys that were moved out of the annex have a hard link still in the {- Keys that were moved out of the annex have a hard link still in the
- annex, with > 1 link count, and those can be removed. - annex, with > 1 link count, and those can be removed.