diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-12 13:23:22 -0400 |
| commit | 4d49342612dd441cdc503b5294035fc05a9a5a77 (patch) | |
| tree | 435a82d44b5a6aa3df411b36fb9fad2553cc670a /Annex/Perms.hs | |
| parent | 44a48a19ffeb8085e7ae1f6bf58d5661adaf8a8d (diff) | |
| parent | 5cd9e10cde3c06ecc6a97f5f60a9def22f959bd2 (diff) | |
Merge branch 'master' into concurrentprogress
Conflicts:
Command/Fsck.hs
Messages.hs
Remote/Directory.hs
Remote/Git.hs
Remote/Helper/Special.hs
Types/Remote.hs
debian/changelog
git-annex.cabal
Diffstat (limited to 'Annex/Perms.hs')
| -rw-r--r-- | Annex/Perms.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/Perms.hs b/Annex/Perms.hs index 3ae351d8c..06971173f 100644 --- a/Annex/Perms.hs +++ b/Annex/Perms.hs @@ -69,14 +69,14 @@ annexFileMode = withShared $ return . go {- Creates a directory inside the gitAnnexDir, including any parent - directories. Makes directories with appropriate permissions. -} createAnnexDirectory :: FilePath -> Annex () -createAnnexDirectory dir = traverse dir [] =<< top +createAnnexDirectory dir = walk dir [] =<< top where top = parentDir <$> fromRepo gitAnnexDir - traverse d below stop + walk d below stop | d `equalFilePath` stop = done | otherwise = ifM (liftIO $ doesDirectoryExist d) ( done - , traverse (parentDir d) (d:below) stop + , walk (parentDir d) (d:below) stop ) where done = forM_ below $ \p -> do |