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 2019-09-01 19:16:37 -04:00
commit 326d8fe926
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
3 changed files with 94 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/bugs/addurl_fails_because_special_remote_is_not_available.mdwn Normal file
View file

@ -0,0 +1 @@
I can't addurl a file because there is a special remote which is not available. I can see that git annex is asking it if it wants to claim the url which it doesn't. I don't feel addurl should depend on the remote after CLAIMURL-FAILURE. Or do I miss something?

49
doc/bugs/regression__58___fails_to_detect_need_for_pidlock_on_an_NSF_mount/comment_2_9bd5f0acb9761dcf59ecd38092e3e14d._comment Normal file
View file

@ -0,0 +1,49 @@
[[!comment format=mdwn
username="yarikoptic"
avatar="http://cdn.libravatar.org/avatar/f11e9c84cb18d26a1748c33b48c924b4"
subject="comment 2"
date="2019-08-31T13:00:57Z"
content="""
I have ran git bisect, didn't double check but it points to
[[!format sh \"\"\"
...
running /home/bids/git-annexes/datalad/tools/bisect-git-annex /home/bids/datalad-datalad-master-git-annex-dev.simg /home/bids/git-annexes/datalad/tools/bisect-git-annex.scripts/bisect-nfs-lock.sh
I: cleaning /home/bids/git-annexes/git-annex
I: building 7.20181211-248-gd5f246370
I: running the script
Initialized empty Git repository in /inbox/BIDS/.git/tmp/repo/.git/
init
git-annex: waitToSetLock: resource exhausted (No locks available)
failed
git-annex: init: 1 failed
d5f2463702a7cd8e56ea000e21bfe5d4ba9cd386 is the first bad commit
commit d5f2463702a7cd8e56ea000e21bfe5d4ba9cd386
Author: Joey Hess <joeyh@joeyh.name>
Date: Thu Jan 17 15:40:44 2019 -0400
misctmp cleanup
* Switch to using .git/annex/othertmp for tmp files other than partial
downloads, and make stale files left in that directory when git-annex
is interrupted be cleaned up promptly by subsequent git-annex processes.
* The .git/annex/misctmp directory is no longer used and git-annex will
delete anything lingering in there after it's 1 week old.
Also, in Annex.Ingest, made the filename it uses in the tmp dir be
prefixed with \"ingest-\" to avoid potentially using a filename used by
some other code.
:040000 040000 3a3f3af1c5222bb96684c79b9bccc20b3ff266a2 24efba74a2b6e4a361e300f32325fafba76b8243 M Annex
:040000 040000 193fa3b2bc663031a0e387e921c720e022daabbc 6a0081f3e1df14a182416e734eedb0a2d8bdd46d M Assistant
:100644 100644 d313f9ee315a095e992b729f0d7001e14f413aee f5c5f511d85ffb52c303d1b718fc62e5179b66f9 M CHANGELOG
:040000 040000 432613892dd51d2ebb804f11c96d1d2c7956dab7 9bcbedc855d35faeeaf9b6d74cc2f48c48d8d764 M Command
:040000 040000 0d4841d00ee7ec5b59037ac2c37ab10482359671 0b12fe02a9028e3a7a083fd3dfdc01bf38a8626e M Remote
:100644 100644 555166e29905dca5984403500528d4594b4b7bb6 8f9c460306db4c9f3abed23d9181a10f20b42b77 M Test.hs
:040000 040000 2eb286c09f87da53c2377cc60b75c2c49fcd049a 33adb5b5e5b8a33b2012345b73f00eb094afd42c M Types
:040000 040000 0406fc6fff2205a48d6a215cf18dba2c682de99e a688ce72ede0bbb71b7e2f1f6a811602ee333a16 M doc
:100644 100644 839b469b5cea11a65f20652963fea316be367c93 ff2db6e39cee114d8bd386873b0dba6f89e4d4d1 M git-annex.cabal
bisect run success
\"\"\"]]
may be that gives ideas? (build env was the same, freshly regenerated buster singularity image available via `singularity pull shub://datalad/datalad:git-annex-dev`
"""]]

44
doc/forum/Reinject_does_not_have_expected_content_of_file.mdwn Normal file
View file

@ -0,0 +1,44 @@
Hi,
I am trying to recover files from Hubic that were at some point uploaded with a leading slash in the filename. This made it impossible to get them with the git annex rclone extension because rclone interprets the leading slash as a directory move. So I wrote a script using the swiftclient python lib to download the files anyway. Then I am decrypting them with the ga_decrypt shell script and I am trying to reinject them into my local repo. For some files, the --known flag just works and injects the contents to the symlink that is broken. For some cases, I have to submit the src and dst filename and for some cases even then git-annex will tell me that the content does not match the expected content of the file.
This is the process that I follow:
For the file that is only on hubic I do a git-annex get file. The error message (since hubic integration is not working for that repo) gives me the key that I need to look that file up in hubic (what would be a cleaner way?):
git annex get 2012-06-23\ 15\:17\:23.mp4
get 2012-06-23 15:17:23.mp4 (from hubic...)
mv: cannot stat '/tmp/rclone-annex-tmp.diesZi1ZL/GPGHMACSHA1--b22130c742403960d80c0e9c78314e3d7034ba79': No such file or directory
Unable to access these remotes: hubic
Try making some of these repositories available:
396e481c-5fc9-4933-b6a4-b1398fb7c61b -- [hubic]
failed
git-annex: get: 1 failed
I prepend the leading slash and download that file manually from hubic. I use ga_decrypt and get files that actually are readable (in this case a video).
However, when I do git-annex reinject src dst I get (I removed the colons because I wanted to rule out a bug):
git-annex: 2012-06-23_151723.mp4 does not have expected content of ../Pictures/Marek Handy/2012/2012-06-23_151723.mp4
failed
git-annex: reinject: 1 failed
Ok so apparently, git annex does not like that content for that file. Also if I do git-annex calckey on the downloaded and decrypted file I get a different key than the original key.
git-annex calckey 2012-06-23_151723.mp4
SHA256E-s19520577--116c8b3101916fb1d81bf6816cc1b616a8eb30b5fe7b293053cfdd41fa178b0a.mp4
but ls -l on the file gives me:
ls -larth ../Pictures/Marek\ Handy/2012/2012-06-23\ 15\:17\:23.mp4
lrwxrwxrwx 1 marek marek 201 Aug 6 17:28 '../Pictures/Marek Handy/2012/2012-06-23 15:17:23.mp4' -> ../../../.git/annex/objects/jQ/mk/SHA256E-s19120318--2631ff42deb7419e97dc46e7423937694c40d09b336d9b8e7aa2c5fe94e73cc7 /SHA256E-s19120318--2631ff42deb7419e97dc46e7423937694c40d09b336d9b8e7aa2c5fe94e73cc7
I appreciate any hints to what went wrong or where maybe my thinking is wrong?
Thank you,
Marek