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

propellor spin

This commit is contained in:
Joey Hess 2014-07-07 01:57:59 -04:00
parent a0fb0f9928
commit 593043515f
Failed to extract signature
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Propellor/CmdLine.hs
View File

@ -92,7 +92,7 @@ defaultMain hostlist = do
go False (Boot hn) = onlyProcess $ withhost hn boot go False (Boot hn) = onlyProcess $ withhost hn boot
withhost :: HostName -> (Host -> IO ()) -> IO () withhost :: HostName -> (Host -> IO ()) -> IO ()
withhost hn a = maybe (unknownhost hn) a (findHost hostlist hn) withhost hn a = maybe (unknownhost hn hostlist) a (findHost hostlist hn)
onlyProcess :: IO a -> IO a onlyProcess :: IO a -> IO a
onlyProcess a = bracket lock unlock (const a) onlyProcess a = bracket lock unlock (const a)
@ -106,11 +106,12 @@ onlyProcess a = bracket lock unlock (const a)
alreadyrunning = error "Propellor is already running on this host!" alreadyrunning = error "Propellor is already running on this host!"
lockfile = localdir </> ".lock" lockfile = localdir </> ".lock"
unknownhost :: HostName -> IO a unknownhost :: HostName -> [Host] -> IO a
unknownhost h = errorMessage $ unlines unknownhost h hosts = errorMessage $ unlines
[ "Propellor does not know about host: " ++ h [ "Propellor does not know about host: " ++ h
, "(Perhaps you should specify the real hostname on the command line?)" , "(Perhaps you should specify the real hostname on the command line?)"
, "(Or, edit propellor's config.hs to configure this host)" , "(Or, edit propellor's config.hs to configure this host)"
, "Known hosts: " ++ unwords (map hostName hosts)
] ]
buildFirst :: CmdLine -> IO () -> IO () buildFirst :: CmdLine -> IO () -> IO ()