summaryrefslogtreecommitdiff
path: root/src/Propellor/Info.hs
diff options
context:
space:
mode:
authorJoey Hess2015-09-14 20:23:08 -0400
committerJoey Hess2015-09-14 20:23:08 -0400
commite5c398a0f6dfc65d56c2dcdf2e8bbf031579ef38 (patch)
treec76125aaf059f4acaab6a32c3cfc223e5294c787 /src/Propellor/Info.hs
parent0f9f05ae9e65182daa9bfc98a9932e2e1382e9b5 (diff)
parentfb7b1826870c8a0e01f88da74ff2fd98a0626d5b (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Info.hs')
-rw-r--r--src/Propellor/Info.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs
index b9436e58..74614a1b 100644
--- a/src/Propellor/Info.hs
+++ b/src/Propellor/Info.hs
@@ -87,7 +87,7 @@ aliasMap = M.fromList . concat .
map (\h -> map (\aka -> (aka, h)) $ fromAliasesInfo $ getInfo $ hostInfo h)
findHost :: [Host] -> HostName -> Maybe Host
-findHost l hn = maybe (findAlias l hn) Just (findHostNoAlias l hn)
+findHost l hn = (findHostNoAlias l hn) <|> (findAlias l hn)
findHostNoAlias :: [Host] -> HostName -> Maybe Host
findHostNoAlias l hn = M.lookup hn (hostMap l)