summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/Propellor/CmdLine.hs10
-rw-r--r--src/Propellor/Protocol.hs2
2 files changed, 1 insertions, 11 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs
index df4d44a6..66da6339 100644
--- a/src/Propellor/CmdLine.hs
+++ b/src/Propellor/CmdLine.hs
@@ -233,16 +233,6 @@ spin hn hst = do
hClose fromh
sendGitClone hn
comm cacheparams privdata
- -- Ready is only sent by old versions of
- -- propellor. They expect to get privdata,
- -- and then no more protocol communication.
- dispatch (Just Ready) = do
- sendprivdata toh privdata
- hClose toh
- -- Display remaining output.
- void $ tryIO $ forever $
- putStrLn =<< hGetLine fromh
- hClose fromh
dispatch Nothing = return ()
user = "root@"++hn
diff --git a/src/Propellor/Protocol.hs b/src/Propellor/Protocol.hs
index 7249e2b1..f8b706cc 100644
--- a/src/Propellor/Protocol.hs
+++ b/src/Propellor/Protocol.hs
@@ -9,7 +9,7 @@ import Data.List
import Propellor
-data Stage = Ready | NeedGitClone | NeedRepoUrl | NeedPrivData | NeedGitPush
+data Stage = NeedGitClone | NeedRepoUrl | NeedPrivData | NeedGitPush
deriving (Read, Show, Eq)
type Marker = String