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

revert test

This commit is contained in:
Joey Hess 2015-05-30 14:03:23 -04:00
parent 536d9fec70
commit 7b8b779360
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config-joey.hs
View File

@ -145,7 +145,7 @@ orca = standardSystem "orca.kitenet.net" Unstable "amd64"
honeybee :: Host honeybee :: Host
honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf" honeybee = standardSystem "honeybee.kitenet.net" Testing "armhf"
[ "Arm git-annex build box." ] [ "Arm git-annex build box." ]
& ipv6 "2001:4830:1600:187::3" & ipv6 "2001:4830:1600:187::2"
-- No unattended upgrades as there is currently no console access. -- No unattended upgrades as there is currently no console access.
-- (Also, system is not currently running a stock kernel, -- (Also, system is not currently running a stock kernel,

1
src/Propellor/Spin.hs
View File

@ -102,7 +102,6 @@ getSshTarget target hst
go (Left e) = useip (show e) go (Left e) = useip (show e)
go (Right addrinfos) = do go (Right addrinfos) = do
configaddrinfos <- catMaybes <$> mapM iptoaddr configips configaddrinfos <- catMaybes <$> mapM iptoaddr configips
print (configips, configaddrinfos, map addrAddress addrinfos)
if any (`elem` configaddrinfos) (map addrAddress addrinfos) if any (`elem` configaddrinfos) (map addrAddress addrinfos)
then return target then return target
else useip ("DNS lookup did not return any of the expected addresses " ++ show configips) else useip ("DNS lookup did not return any of the expected addresses " ++ show configips)