diff options
Diffstat (limited to 'Command')
-rw-r--r-- | Command/List.hs | 2 | ||||
-rw-r--r-- | Command/Uninit.hs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Command/List.hs b/Command/List.hs index 2676b5d5d..05f12822a 100644 --- a/Command/List.hs +++ b/Command/List.hs @@ -11,7 +11,6 @@ module Command.List where import qualified Data.Set as S import qualified Data.Map as M import Data.Function -import Data.Tuple.Utils import Data.Ord import Command @@ -20,6 +19,7 @@ import Logs.Trust import Logs.UUID import Annex.UUID import Git.Types (RemoteName) +import Utility.Tuple cmd :: Command cmd = noCommit $ withGlobalOptions annexedMatchingOptions $ diff --git a/Command/Uninit.hs b/Command/Uninit.hs index d8c7d1295..af628d7a9 100644 --- a/Command/Uninit.hs +++ b/Command/Uninit.hs @@ -18,9 +18,6 @@ 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" SectionUtility @@ -101,7 +98,8 @@ prepareRemoveAnnexDir annexdir = do prepareRemoveAnnexDir' :: FilePath -> IO () prepareRemoveAnnexDir' annexdir = - recurseDir SystemFS annexdir >>= mapM_ (void . tryIO . allowWrite) + dirTreeRecursiveSkipping (const False) 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. |