Merge branch 'master' of ssh://git-annex.branchable.com

This commit is contained in:
Joey Hess 2014-01-01 16:27:50 -04:00
commit d544d0e086
3 changed files with 30 additions and 0 deletions

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2014-01-01T20:13:04Z"
content="""
This strongly resembles ghc RTS bugs such as <http://bugs.debian.org/677096> (except that one got fixed, and affected the non-threaded RTS, while this is using the threaded RTS).
The assistant and the webapp are the same process. The only difference is whether a web browser is talking to it. Unless the other bug is regarding the CPU used by the web browser, that other bug is a duplicate of this one.
"""]]

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 1"
date="2014-01-01T19:56:32Z"
content="""
I can reproduce this bug. Seems the problem is that sshTranscript is called with a string that is fed in on stdin. But I guess that on Windows, ssh password prompting is also done using stdin (on Linux it would use /dev/tty), and so this prevents it from prompting.
I've fixed this for the remote ssh server setup in the webapp, which did not actually need to feed anything in on stdin. Confirmed ssh adding works!
However, for rsync.net, the ssh pubkey is fed into dd using stdin, and so I was unable to fix it there yet. Since rsync.net does not support redirection to files in its shell, the only approach that would seem to work is to first download the authorized_keys file, add the line, and rsync in the new file. Until I get a chance to do that, I am leaving this bug report open.
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="209.250.56.227"
subject="comment 2"
date="2014-01-01T19:59:11Z"
content="""
Also, fixing rsync.net that way would mean two ssh connections to set up authorized_keys, so 2 password prompts. suboptimal..
"""]]