diff options
| author | Joey Hess <joeyh@joeyh.name> | 2017-10-25 11:48:50 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-10-25 11:48:50 -0400 |
| commit | 628f239e0dab82cee2c1b9a1f2818695990df122 (patch) | |
| tree | b9260f539dcf6eb126a6e0476528364eb81ab600 /src/Propellor/Property/Chroot.hs | |
| parent | c693c11b69cfa18d30fbadefbea257bf62c314a6 (diff) | |
| parent | b437fa963d7e44945d24c1c5a6453cebcaf7a682 (diff) | |
Merge remote-tracking branch 'nicolas/ignore-lost-n-found'
Diffstat (limited to 'src/Propellor/Property/Chroot.hs')
| -rw-r--r-- | src/Propellor/Property/Chroot.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Propellor/Property/Chroot.hs b/src/Propellor/Property/Chroot.hs index 9e8bcd2f..ea8b1407 100644 --- a/src/Propellor/Property/Chroot.hs +++ b/src/Propellor/Property/Chroot.hs @@ -77,7 +77,7 @@ instance ChrootBootstrapper ChrootTarball where tightenTargets $ extractTarball loc tb extractTarball :: FilePath -> FilePath -> Property UnixLike -extractTarball target src = check (unpopulated target) $ +extractTarball target src = check (isUnpopulated target) $ cmdProperty "tar" params `assume` MadeChange `requires` File.dirExists target @@ -151,7 +151,7 @@ provisioned' c@(Chroot loc bootstrapper infopropigator _) systemdonly = cantbuild e = property (chrootDesc c "built") (error e) teardown :: Property Linux - teardown = check (not <$> unpopulated loc) $ + teardown = check (not <$> isUnpopulated loc) $ property ("removed " ++ loc) $ makeChange (removeChroot loc) |