cadey
/
propellor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

overall status hash

This commit is contained in:
Joey Hess 2014-03-30 02:57:02 -04:00
parent 7820c8bb12
commit 398a5febbd
Failed to extract signature
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -1,8 +1,10 @@
run: build run: pull build
./propellor ./propellor
build: deps dist/setup-config pull:
git pull git pull
build: deps dist/setup-config
cabal build cabal build
$(MAKE) tags $(MAKE) tags
ln -sf dist/build/propellor/propellor ln -sf dist/build/propellor/propellor

4
Property.hs
View File

@ -59,7 +59,7 @@ combineProperties desc ps = IOProperty desc $ go ps NoChange
_ -> go ls (combineResult r rs) _ -> go ls (combineResult r rs)
ensureProperty :: Property -> IO Result ensureProperty :: Property -> IO Result
ensureProperty = catchDefaultIO FailedChange . ensureProperty' ensureProperty = catchDefaultIO FailedChange . ensureProperty'
ensureProperty' :: Property -> IO Result ensureProperty' :: Property -> IO Result
ensureProperty' (FileProperty _ f a) = go =<< doesFileExist f ensureProperty' (FileProperty _ f a) = go =<< doesFileExist f
@ -81,7 +81,7 @@ ensureProperty' (IOProperty _ a) = a
ensureProperties :: [Property] -> IO () ensureProperties :: [Property] -> IO ()
ensureProperties ps = do ensureProperties ps = do
r <- ensureProperties' ps r <- ensureProperties' [propertyList "overall" ps]
case r of case r of
FailedChange -> exitWith (ExitFailure 1) FailedChange -> exitWith (ExitFailure 1)
_ -> exitWith ExitSuccess _ -> exitWith ExitSuccess