diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-05-30 11:05:56 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-05-30 11:05:56 -0400 |
| commit | b36a75fd93a730ea148e67eb7bf1300d738ff82a (patch) | |
| tree | 8f65595e6de56aabd39d7a6d125c16a99493fa19 /src/Propellor/Property/Debootstrap.hs | |
| parent | fafe1e6f5ce082f93d0b97dbacdcb149778ccaf9 (diff) | |
| parent | aa7dcad9ba8d14013f26f6e8554901d56ef4cb5c (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/Debootstrap.hs')
| -rw-r--r-- | src/Propellor/Property/Debootstrap.hs | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Propellor/Property/Debootstrap.hs b/src/Propellor/Property/Debootstrap.hs index f29ae56b..8d974eba 100644 --- a/src/Propellor/Property/Debootstrap.hs +++ b/src/Propellor/Property/Debootstrap.hs @@ -106,9 +106,7 @@ unpopulated d = null <$> catchDefaultIO [] (dirContents d) removetarget :: FilePath -> IO () removetarget target = do - submnts <- filter (\p -> simplifyPath p /= simplifyPath target) - . filter (dirContains target) - <$> mountPoints + submnts <- mountPointsBelow target forM_ submnts umountLazy removeDirectoryRecursive target |