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

This commit is contained in:
Joey Hess 2013-07-27 20:56:19 -04:00
commit 55bd5a81ad
19 changed files with 204 additions and 0 deletions

View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="I can't reproduce this problem, but I see several people have reported it."
date="2013-07-27T22:11:15Z"
content="""
It would be helpful for anyone who can reproduce this problem to do so with debugging enabled on both sides
(run with --debug or turn it on in the Configuration page in webapp), and then send the `.git/annex/daemon.log`
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 2"
date="2013-07-28T00:27:23Z"
content="""
Remote mythbuntuserver.local_annex does not have git-annex installed; setting remote.mythbuntuserver.local_annex.annex-ignore
So, how did you install git-annex on mythbuntuserver? What does the `.ssh/authorized_keys` on mythbuntuserver look like? (In particular the key that git-annex adds to it, which should be set to run git-annex-shell.)
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 4"
date="2013-07-28T00:23:08Z"
content="""
Hmm, Adam your version is older than the bug reporter's version. OTOH, while there were several FD leak fixes after your version, none of them were to Annex.LockPool, which is what's used for the ssh lock files.
I can't reproduce it with `git annex get` and the current release.. can you?
"""]]

View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 3"
date="2013-07-27T22:39:12Z"
content="""
The --from is the missing piece to reproduce:
[[!format sh \"\"\"
joey@gnu:~/tmp/old/mydir2>git annex get disk2 --from origin
joey@gnu:~/tmp/old/mydir2>
\"\"\"]]
What's going on here is that `get --from` is essentially an alias to `copy --from`, and that skips copying files that it knows are not present on the remote. Since the remote is a local directory, it's inexpensive for it to check if the file is really there, rather than relying on the location log.
This seems suboptimal, but I'm not sure which part of the behavior it makes sense to change. It seems nice for `copy --from` to silently skip files that the remote does not have, to avoid much unnecessary output when processing a lot of files. Maybe `get --from` should behave differently?
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 4"
date="2013-07-27T22:40:58Z"
content="""
I should add that it also seems to make sense to stat the file to see if it's present, like it does now. The location log can be out of date, and when more accurate info is right there, it should use it. And nor is the location log being out of date something that it should complain about, because it can easily happen eg when `git annex sync` has not been run recently.
"""]]

View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 11"
date="2013-07-28T00:06:53Z"
content="""
From the log on bang:
<pre>
[2013-07-27 00:33:15 PDT] read: ssh [\"-S\",\"/home/drewp/annex2/.git/annex/ssh/drewp@git-annex-dash.local-drewp_annex2\",\"-o\",\"ControlMaster=auto\",\"-o\",\"ControlPersist=yes\",\"-T\",\"drewp@git-annex-dash.local-drewp_annex2\",\"git-annex-shell 'configlist' '/~/annex2/'\"]
zsh:1: command not found: git-annex-shell
Remote dash.local_annex2 does not have git-annex installed; setting remote.dash.local_annex2.annex-ignore
</pre>
You said you're running from the standalone tarball. I think that's the problem, probably if you get git-annex-shell into your path it'll just work.
Can you paste the line git-annex added to \"dash\"'s .ssh/authorized_keys?
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.152.246.110"
subject="comment 3"
date="2013-07-27T23:51:38Z"
content="""
uninit does not do this. Nor does unannex --fast FWIW.
"""]]