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

include problem PairData in error message

Browse source 
Users occasionally report this error firing, and I can't see why,
so include the rejected PairData in the error message.

This is safe even if it contains evil escape characters, because showing
it displays them in escaped form.

This commit was sponsored by Bruno BEAUFILS on Patreon.
This commit is contained in:
Joey Hess 2017-02-13 15:51:13 -04:00
parent f36c230c78
commit f36adc2dbc
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Assistant/Threads/PairListener.hs
View file

@ -49,8 +49,8 @@ pairListenerThread urlrenderer = namedThread "PairListener" $ do
debug ["ignoring message that looped back"]
go reqs cache sock
(_, _, False, _) -> do
liftAnnex $ warning
"illegal control characters in pairing message; ignoring"
liftAnnex $ warning $
"illegal control characters in pairing message; ignoring (" ++ show (pairMsgData m) ++ ")"
go reqs cache sock
-- PairReq starts a pairing process, so a
-- new one is always heeded, even if

13
doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_7_625df33e70f2f959c574d918a706648d._comment Normal file
View file

@ -0,0 +1,13 @@
[[!comment format=mdwn
username="joey"
subject="""comment 7"""
date="2017-02-13T19:52:36Z"
content="""
Seems we can rule out user/hostname/directory, which probably leaves
the ssh public key as the culprit, but I'm not sure.
So, I changed the error message to display the problem data,
in [[!commit 5fd15677042b66be81936f081fe0a17f5960096f]]. Once you have a
git-annex version with that commit, if you see the problem, paste in the
error message and I should be able to get to the bottom of this.
"""]]