diff options
| author | Joey Hess <joey@kitenet.net> | 2014-10-24 09:58:12 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-24 09:58:12 -0400 |
| commit | 3959d5be901121cc697316837b96b6bdc37248d2 (patch) | |
| tree | 93bbef55ad3d247f2e64d5cb7ceb1f3679514935 /src/Propellor/Info.hs | |
| parent | 2bd599470a875b10159535ecb44b3a3aac59da85 (diff) | |
| parent | b5ab8a7f9fedc283cd561b8a414748ecee3868fd (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Info.hs')
| -rw-r--r-- | src/Propellor/Info.hs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/Propellor/Info.hs b/src/Propellor/Info.hs index 1b89c008..f44d1de3 100644 --- a/src/Propellor/Info.hs +++ b/src/Propellor/Info.hs @@ -80,7 +80,10 @@ aliasMap = M.fromList . concat . map (\h -> map (\aka -> (aka, h)) $ S.toList $ _aliases $ hostInfo h) findHost :: [Host] -> HostName -> Maybe Host -findHost l hn = maybe (findAlias l hn) Just (M.lookup hn (hostMap l)) +findHost l hn = maybe (findAlias l hn) Just (findHostNoAlias l hn) + +findHostNoAlias :: [Host] -> HostName -> Maybe Host +findHostNoAlias l hn = M.lookup hn (hostMap l) findAlias :: [Host] -> HostName -> Maybe Host findAlias l hn = M.lookup hn (aliasMap l) |