diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-01-28 17:40:26 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-01-28 17:40:26 -0400 |
| commit | ff8a0b0b73685283aedf6d49cdd9b27f22fe6e9f (patch) | |
| tree | 9858a24afca1f34a4007165a03395aa8d1350855 /Command/Uninit.hs | |
| parent | 20a8350e36f6e38b55603e6578fa7b1c4967c1a9 (diff) | |
Revert "avoid using MissingH's HVFS layer"
This reverts commit 961b5d4d997999485e7b696416574cd0f8663f88.
This broke unit and test suite cleanup. The difference is that
dirContentsRecursive only returns files, but this needs to also operate on
directories.
Diffstat (limited to 'Command/Uninit.hs')
| -rw-r--r-- | Command/Uninit.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Command/Uninit.hs b/Command/Uninit.hs index 592b71a02..28c169919 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -18,6 +18,9 @@ import Annex.Content import Annex.Init import Utility.FileMode +import System.IO.HVFS +import System.IO.HVFS.Utils + cmd :: [Command] cmd = [addCheck check $ command "uninit" paramPaths seek SectionUtility "de-initialize git-annex and clean out repository"] @@ -88,7 +91,7 @@ finish = do - preparation for removal. -} prepareRemoveAnnexDir :: FilePath -> IO () 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 - annex, with > 1 link count, and those can be removed. |