diff options
| author | Joey Hess <joey@kitenet.net> | 2014-07-06 17:15:27 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-07-06 17:16:04 -0400 |
| commit | e6ce744078aed2840ea51cc49ac6149ac6f4418d (patch) | |
| tree | aabc1895a5116161ef467cbcc6bbd930cdf197b0 /src/Propellor/CmdLine.hs | |
| parent | 95c99b490d1fa942de6e29e560368d5b614eb309 (diff) | |
move privdata Property to toplevel so its Info propigates
Ugh, that's a nasty gotcha but I cannot see a way to fix it generally right
now.
Diffstat (limited to 'src/Propellor/CmdLine.hs')
| -rw-r--r-- | src/Propellor/CmdLine.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Propellor/CmdLine.hs b/src/Propellor/CmdLine.hs index c4a3afec..5e20427e 100644 --- a/src/Propellor/CmdLine.hs +++ b/src/Propellor/CmdLine.hs @@ -186,7 +186,7 @@ spin hn = do where go cacheparams url privdata = withBothHandles createProcessSuccess (proc "ssh" $ cacheparams ++ [user, bootstrapcmd]) $ \(toh, fromh) -> do let finish = do - senddata toh privDataLocal privDataMarker privdata + senddata toh "privdata" privDataMarker privdata hClose toh -- Display remaining output. @@ -228,8 +228,8 @@ spin hn = do Just status -> return status showremote s = putStrLn s - senddata toh f marker s = void $ - actionMessage ("Sending " ++ f ++ " (" ++ show (length s) ++ " bytes) to " ++ hn) $ do + senddata toh desc marker s = void $ + actionMessage ("Sending " ++ desc ++ " (" ++ show (length s) ++ " bytes) to " ++ hn) $ do sendMarked toh marker s return True |
