remove what should be dead code
While old propellor's can emit Ready, they won't if they've managed to updateFirst. If updateFirst fails due to eg, inaccessiable central repo, those old propellor's are not able to receive inline git pushes anyway, so are not going to update no matter what, so no point in making --spin work in that case.
This commit is contained in:
parent
907ecfb464
commit
65d3f085dc
|
@ -233,16 +233,6 @@ spin hn hst = do
|
||||||
hClose fromh
|
hClose fromh
|
||||||
sendGitClone hn
|
sendGitClone hn
|
||||||
comm cacheparams privdata
|
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 ()
|
dispatch Nothing = return ()
|
||||||
|
|
||||||
user = "root@"++hn
|
user = "root@"++hn
|
||||||
|
|
|
@ -9,7 +9,7 @@ import Data.List
|
||||||
|
|
||||||
import Propellor
|
import Propellor
|
||||||
|
|
||||||
data Stage = Ready | NeedGitClone | NeedRepoUrl | NeedPrivData | NeedGitPush
|
data Stage = NeedGitClone | NeedRepoUrl | NeedPrivData | NeedGitPush
|
||||||
deriving (Read, Show, Eq)
|
deriving (Read, Show, Eq)
|
||||||
|
|
||||||
type Marker = String
|
type Marker = String
|
||||||
|
|
Loading…
Reference in New Issue