diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | Property.hs | 4 |
2 files changed, 6 insertions, 4 deletions
@@ -1,8 +1,10 @@ -run: build +run: pull build ./propellor -build: deps dist/setup-config +pull: git pull + +build: deps dist/setup-config cabal build $(MAKE) tags ln -sf dist/build/propellor/propellor diff --git a/Property.hs b/Property.hs index f7dcccde..4aba094f 100644 --- a/Property.hs +++ b/Property.hs @@ -59,7 +59,7 @@ combineProperties desc ps = IOProperty desc $ go ps NoChange _ -> go ls (combineResult r rs) ensureProperty :: Property -> IO Result -ensureProperty = catchDefaultIO FailedChange . ensureProperty' +ensureProperty = catchDefaultIO FailedChange . ensureProperty' ensureProperty' :: Property -> IO Result ensureProperty' (FileProperty _ f a) = go =<< doesFileExist f @@ -81,7 +81,7 @@ ensureProperty' (IOProperty _ a) = a ensureProperties :: [Property] -> IO () ensureProperties ps = do - r <- ensureProperties' ps + r <- ensureProperties' [propertyList "overall" ps] case r of FailedChange -> exitWith (ExitFailure 1) _ -> exitWith ExitSuccess |