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

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

Browse source
This commit is contained in:
Joey Hess 2013-11-06 11:51:58 -04:00
commit fc82197549
2 changed files with 65 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
doc/bugs/web_app_loops_over_a_non-addable_file.mdwn Normal file
View file

@ -0,0 +1,54 @@
### Please describe the problem.
I started the webapp on a pre-existing repo today, and it started adding all sorts of files which I didn't manually add, which is a little bit surprising, but "okay".
The problem is that it would loop over this one file over and over again. Adding it on the commandline yields a proper error, but this doesn't seem to properly propagate to the frontend.
### What steps will reproduce the problem?
Unclear.
### What version of git-annex are you using? On what operating system?
4.20131105-g8efdc1a
### Please provide any additional information below.
Here's the daemon.log:
[[!format sh """
# If you can, paste a complete transcript of the problem occurring here.
# If the problem is with the git-annex assistant, paste in .git/annex/daemon.log
add clips/A31-05-12_21.22.amr (checksum...) [2013-11-06 10:21:10 EST] Committer: Committing changes to git
[2013-11-06 10:21:11 EST] Committer: Adding A31-05-12_21.22.amr
(Recording state in git...)
(Recording state in git...)
add clips/A31-05-12_21.22.amr (checksum...) [2013-11-06 10:21:11 EST] Committer: Committing changes to git
[2013-11-06 10:21:12 EST] Committer: Adding A31-05-12_21.22.amr
(Recording state in git...)
(Recording state in git...)
add clips/A31-05-12_21.22.amr (checksum...) [2013-11-06 10:21:12 EST] Committer: Committing changes to git
[2013-11-06 10:21:13 EST] Committer: Adding A31-05-12_21.22.amr
(Recording state in git...)
add clips/A31-05-12_21.22.amr (checksum...) [2013-11-06 10:21:13 EST] Committer: Committing changes to git
[2013-11-06 10:21:14 EST] Committer: Adding A31-05-12_21.22.amr
(Recording state in git...)
(Recording state in git...)
add clips/A31-05-12_21.22.amr (checksum...) [2013-11-06 10:21:14 EST] Committer: Committing changes to git
# End of transcript or log.
"""]]
And here's the attempt on the commandline, which is way more informative:
[[!format sh """
anarcat@marcos:video$ git annex add .
add clips/96_257.mp3 ok
add clips/A31-05-12_21.22.amr (checksum...)
git-annex: /srv/video/.git/annex/objects/z3/96/SHA256E-s260070--46f0d657cdd79032d431e2aebb04b63685ab26e7d00963036e0b64c9f86998f8.22.amr/SHA256E-s260070--46f0d657cdd79032d431e2aebb04b63685ab26e7d00963036e0b64c9f86998f8.22.amr: setFileMode: permission denied (Operation not permitted)
failed
"""]]
Turns out that file is owned by root, so it's an expected failure. But the webapp should simply skip this file, not loop over it.
The workaround is obviously to give this file to the proper user. --[[anarcat]]

11
doc/forum/preferred_content.mdwn Normal file
View file

@ -0,0 +1,11 @@
Hello all,
I'm trying to use "preferred content" with git-annex but I suspect that my version doesn't provide it.
I'm using Debian "wheezy" that packs git-annex 3.20120629.
I appreciate any help you can give.
Thanks.
Zaka.