mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

include error message when unable to connect to peer

Browse source
This commit is contained in:
Joey Hess 2016-12-08 14:14:08 -04:00
parent b613ccf7a3
commit e56506d83c
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Command/P2P.hs
View file

@ -81,7 +81,7 @@ linkRemote remotename = do
setup (P2PAddressAuth addr authtoken) = do setup (P2PAddressAuth addr authtoken) = do
g <- Annex.gitRepo g <- Annex.gitRepo
conn <- liftIO $ connectPeer g addr conn <- liftIO $ connectPeer g addr
`catchNonAsync` giveup "Unable to connect with peer. Please check that the peer is connected to the network, and try again." `catchNonAsync` connerror
u <- getUUID u <- getUUID
v <- liftIO $ runNetProto conn $ P2P.auth u authtoken v <- liftIO $ runNetProto conn $ P2P.auth u authtoken
case v of case v of
@ -96,3 +96,4 @@ linkRemote remotename = do
storeP2PRemoteAuthToken addr authtoken storeP2PRemoteAuthToken addr authtoken
return ok return ok
_ -> giveup "Unable to authenticate with peer. Please check the address and try again." _ -> giveup "Unable to authenticate with peer. Please check the address and try again."
connerror e = giveup $ "Unable to connect with peer. Please check that the peer is connected to the network, and try again. (" ++ show e ++ ")"