summaryrefslogtreecommitdiff
path: root/Propellor
diff options
context:
space:
mode:
authorJoey Hess2014-03-31 16:50:30 -0400
committerJoey Hess2014-03-31 16:50:30 -0400
commitb5b9fa922b9b836a86ae5afd8954790c16aad823 (patch)
treeeba7e2fd34154b6ea512d84fc070f2bf0ef772c0 /Propellor
parentd9aac0a4c09b43a0b414a7801a76cdce5f802a4d (diff)
propellor spin
Diffstat (limited to 'Propellor')
-rw-r--r--Propellor/CmdLine.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Propellor/CmdLine.hs b/Propellor/CmdLine.hs
index 516bb5c5..0b680d12 100644
--- a/Propellor/CmdLine.hs
+++ b/Propellor/CmdLine.hs
@@ -103,7 +103,7 @@ pullFirst cmdline next = do
newsha <- getCurrentGitSha1 branchref
if oldsha == newsha
- then error "unchanged"
+ then next
else do
putStrLn "Rebuilding propeller.."
hFlush stdout
@@ -150,7 +150,7 @@ spin host = do
]
, "else " ++ intercalate " && "
[ "cd " ++ localdir
- , "if ! test -x ./propellor; then make build; fi"
+ --, "if ! test -x ./propellor; then make build; fi"
, "./propellor --boot " ++ host
]
]