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

This commit is contained in:
Joey Hess 2015-02-22 14:50:19 -04:00
commit eccc88925c
15 changed files with 327 additions and 0 deletions

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawnbPKLjBONawBd74MKJZo05juCqdsP1jAU"
nickname="Ramon"
subject="bug still there"
date="2015-02-22T14:58:41Z"
content="""
As of today (with v 5.20150219-gd24cfd3, on two different Android tablets, one with Android 4.1.1 and the other 4.4.1) it is still impossible to switch repos in Android webapp. So configuration, etc, of different repos becomes somewhat of a pain.
"""]]

View file

@ -0,0 +1,34 @@
### Please describe the problem.
Unable to add remote server using ssh on a 4.1 device.
The error message on the android is: Failed to ssh to the server. Transcript: Could not create directory '(null)/.ssh'.
The message from sshd on the server is: Feb 20 11:32:37 thrain sshd[1662]: Did not receive identification string from 10.1.0.16
(thrain is the sshd server, 10.1.0.16 is the android)
### What steps will reproduce the problem?
On the android, go into the get-annex webpage, select add remote repository,
add the particulars
hit check this server.
### What version of git-annex are you using? On what operating system?
The android version of git-annex is 5.20150219-gd24cgd3
The version of address is 4.1.1
The sshd server is debian wheezy
### Please provide any additional information below.
[[!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
# End of transcript or log.
"""]]

View file

@ -0,0 +1,20 @@
### Please describe the problem.
When setting git-annex on a device (a mac at least in my case), where git has never been used, you get a cryptic git error in the assistant which prevents you to create your first repo.
Going to the terminal and running git --global for email and name solved the problem.
### What steps will reproduce the problem?
### What version of git-annex are you using? On what operating system?
### Please provide any additional information below.
[[!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
# End of transcript or log.
"""]]

View file

@ -0,0 +1,42 @@
### Please describe the problem.
When cloning a remote client repo via ssh and then enableremote the encryptionsetting seem not be used
### What steps will reproduce the problem?
- create a repository (as client) on computer WO
- create a special remote via rsync+ssh on computer BA with encryption=none from WO
--> syncing works
- git clone via ssh from WO on computer XY, group is manual
- git-annex get on XY with source WO workes (OK)
- enableremote BA on computer XY
- shutdown computer WO
- try to get some file on computer XY. The download is first tried from WO, then from BA --> correct
- download from BA fails (ERROR)
--> Reason seems to be that encryption=none is not honored:
rsync: change_dir "XXXXXXXX/GPGHMACSHA1--398057f8bd37edf898aeae4557c6277f1162382b" failed: No such file or directory (2)
I additionally could not find out where to manually change the encryption settings after enableremote
### What version of git-annex are you using? On what operating system?
git-annex version: 5.20140412ubuntu1
build flags: Assistant Webapp Webapp-secure Pairing Testsuite S3 WebDAV Inotify DBus DesktopNotify XMPP DNS Feeds Quvi TDFA CryptoHash
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
local repository version: 5
supported repository version: 5
upgrade supported from repository versions: 0 1 2 4
### Please provide any additional information below.
[[!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
# End of transcript or log.
"""]]

View file

@ -0,0 +1,29 @@
[[!comment format=c
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 10"
date="2015-02-21T20:46:22Z"
content="""
Could install gconv and adjust the paths so that gconv-modules is found when running sync per ssh.
new Strace at the point of interest:
open(\"/usr/lib/arm-linux-gnueabi/gconv/gconv-modules.cache\", O_RDONLY) = -1 ENOENT (No such file or directory)
open(\"/usr/lib/arm-linux-gnueabi/gconv/gconv-modules\", O_RDONLY|0x80000) = 8
fcntl64(8, F_GETFD) = 0x1 (flags FD_CLOEXEC)
fstat64(8, {st_mode=S_IFREG|0644, st_size=56368, ...}) = 0
mmap2(NULL, 4096, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x2ab6b000
read(8, \"# GNU libc iconv configuration.\n\"..., 4096) = 4096
read(8, \"B1.002//\nalias\tJS//\t\t\tJUS_I.B1.0\"..., 4096) = 4096
read(8, \"59-3\t1\nmodule\tINTERNAL\t\tISO-8859\"..., 4096) = 4096
read(8, \"859-14//\nalias\tISO-IR-199//\t\tISO\"..., 4096) = 4096
read(8, \"CDIC-DK-NO-A//\tEBCDIC-DK-NO-A\t1\n\"..., 4096) = 4096
read(8, \"\t\tIBM281//\t\tIBM281\t\t1\n\n#\tfrom\t\t\t\"..., 4096) = 4096
read(8, \"\tIBM863\t\t1\n\n#\tfrom\t\t\tto\t\t\tmodule\"..., 4096) = 4096
read(8, \"\tmodule\t\tcost\nalias\tIBM-939//\t\tI\"..., 4096) = 4096
read(8, \"\t\t\tmodule\t\tcost\nalias\tEUCCN//\t\t\t\"..., 4096) = 4096
read(8, \"CN//\t\tISO-2022-CN\t1\n\n#\tfrom\t\t\tto\"..., 4096) = 4096
read(8, \"INTERNAL\t\tISO_5427-EXT//\t\tISO_54\"..., 4096) = 4096
read(8, \"e\t\tcost\nmodule\tARMSCII-8//\t\tINTE\"..., 4096) = 4096
read(8, \"2//\nmodule\tIBM1112//\t\tINTERNAL\t\t\"..., 4096) = 4096
read(8, \"\tIBM9448//\nalias\tCP9448//\t\tIBM94\"..., 4096) = 3120
read(8, \"\", 4096) = 0
"""]]

View file

@ -0,0 +1,42 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 11"
date="2015-02-22T01:26:28Z"
content="""
it seems gconv-modules is parsed and afterwards UTF-32.so is selected for encoding translation. But why?
My locale settings:
LANG=en_US.UTF-8
LANGUAGE=en_US
LC_CTYPE=\"en_US.UTF-8\"
LC_NUMERIC=\"en_US.UTF-8\"
LC_TIME=\"en_US.UTF-8\"
LC_COLLATE=\"en_US.UTF-8\"
LC_MONETARY=\"en_US.UTF-8\"
LC_MESSAGES=\"en_US.UTF-8\"
LC_PAPER=\"en_US.UTF-8\"
LC_NAME=\"en_US.UTF-8\"
LC_ADDRESS=\"en_US.UTF-8\"
LC_TELEPHONE=\"en_US.UTF-8\"
LC_MEASUREMENT=\"en_US.UTF-8\"
LC_IDENTIFICATION=\"en_US.UTF-8\"
LC_ALL=
and on my nas:
LANG=en_US.utf8
LC_CTYPE=\"en_US.utf8\"
LC_NUMERIC=\"en_US.utf8\"
LC_TIME=\"en_US.utf8\"
LC_COLLATE=\"en_US.utf8\"
LC_MONETARY=\"en_US.utf8\"
LC_MESSAGES=\"en_US.utf8\"
LC_PAPER=\"en_US.utf8\"
LC_NAME=\"en_US.utf8\"
LC_ADDRESS=\"en_US.utf8\"
LC_TELEPHONE=\"en_US.utf8\"
LC_MEASUREMENT=\"en_US.utf8\"
LC_IDENTIFICATION=\"en_US.utf8\"
LC_ALL=en_US.utf8
"""]]

View file

@ -0,0 +1,15 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 12"
date="2015-02-22T01:47:36Z"
content="""
Approaching...:
added exec locale inside runshell and now I get this error when running per ssh (but not when running on nas!!!)
+ exec locale
fatal: protocol error: bad line length character: LANG
failed
"""]]

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 14"
date="2015-02-22T02:03:59Z"
content="""
Added \"export LANG=en_US.utf8\" to runshell and now it works - fuck yeah!
"""]]

View file

@ -0,0 +1,16 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawlmLuHhscJsoAqb9q0N3LdtHum6LjY1LK4"
nickname="Markus"
subject="comment 9"
date="2015-02-21T20:21:32Z"
content="""
Approaching the solution after hours and hours of debugging:
https://ghc.haskell.org/trac/ghc/ticket/7695
This explains why so much ram is used when trying to open gconv-modules in the ssh strace!
the local strace is using \"/usr/lib/locale/locale-archive\" instead of gconv-modules
both libs are stated in the ghc.haskell bug report
Just have to figure out, why the ghc created haskell binary tries to access gconv-modules instead of locale/locale-archive when run per ssh
"""]]

View file

@ -0,0 +1,54 @@
### Please describe the problem.
annex lists all the remotes UUIDs (the same) when whereis is ran across multiple files. This makes output lengthy and harder to process and share for no reason. Why not to list remotes just once on top and then only locations per each file, e.g. instead of
[[!format sh """
$> git annex whereis
whereis 2011-Palmour-etal_canadian_consent_forms.pdf (2 copies)
00000000-0000-0000-0000-000000000001 -- web
94b3c553-ad30-450e-be56-504b400f9a5c -- yoh@novo:~/proj/open-consent [here]
web: http://download.springer.com/static/pdf/638/art%253A10.1186%252F1472-6939-12-1.pdf?auth66=1401467160_8992951c5cccc0dbe510c369eba3afa1&ext=.pdf
ok
whereis Arizona_consent.pdf (2 copies)
00000000-0000-0000-0000-000000000001 -- web
94b3c553-ad30-450e-be56-504b400f9a5c -- yoh@novo:~/proj/open-consent [here]
web: http://web.arizona.edu/~arg/papers/fmri/forms/consent.pdf
ok
"""]]
get (not sure if I want to see ok much either)
[[!format sh """
$> git annex whereis
00000000-0000-0000-0000-000000000001 -- web
94b3c553-ad30-450e-be56-504b400f9a5c -- yoh@novo:~/proj/open-consent [here]
whereis 2011-Palmour-etal_canadian_consent_forms.pdf (2 copies)
web: http://download.springer.com/static/pdf/638/art%253A10.1186%252F1472-6939-12-1.pdf?auth66=1401467160_8992951c5cccc0dbe510c369eba3afa1&ext=.pdf
whereis Arizona_consent.pdf (2 copies)
web: http://web.arizona.edu/~arg/papers/fmri/forms/consent.pdf
"""]]
### What steps will reproduce the problem?
run git annex whereis on a directory with multiple files
### What version of git-annex are you using? On what operating system?
Debian
[[!format sh """
$> acpolicy git-annex
git-annex:
Installed: 5.20150205+git57-gc05b522-1~nd80+1
Candidate: 5.20150205+git57-gc05b522-1~nd80+1
Version table:
*** 5.20150205+git57-gc05b522-1~nd80+1 0
500 http://neuro.debian.net/debian-devel/ jessie/main amd64 Packages
100 /var/lib/dpkg/status
"""]]

View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm7xPL5WWqhkqJ_XCxvenj2dGb45Y8LkbA"
nickname="Nayan"
subject="try this"
date="2015-02-21T18:40:42Z"
content="""
i think it will work
http://download.cnet.com/My-Disk-Archive/3000-2067_4-76273403.html
"""]]

View file

@ -0,0 +1,11 @@
Hi,
I am pretty confident, that this is a newbie question. Nevertheless, I did not find the answer (or the solution) event after looking at the screencasts and reading through the files.
I want to sync 2 clients on different networks though a ssh cloud server begin a full backup.
Also, I would like to do this for 2 different folders on the clients and server.
I mean : client 1, 2 and the server sync a repo named "DATA" and also sync another repo named "IMAGES"
Setting the client1 as local client repo and also ssh remote repo works quite well, it uploads everything to the server. Then I make the same on the second client, and it does not start to download everything from the server...
Any clue ?

View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="Régis"
subject="Solved..."
date="2015-02-22T16:51:52Z"
content="""
I think after all I found part of the answer here :
http://git-annex.branchable.com/forum/Two_computer_setup:___34__transfer__34___or___34__full_backup__34___repository_groups__63__/
It is mentioned to use Jabber to make both clients message each other when there is something new to sync.
What about my setup with 2 groups of repos syncing together each for itself ? I read somewhere, that the jabber account will sync ALL repos.
Is the solution to create 2 Jabber accounts ?
"""]]

View file

@ -0,0 +1,5 @@
What's the best way of backing up the git repository itself? I feel fairly comfortable using a special remote to create an offsite backup in S3 or Glacier or whatnot, but restoring from those still requires I have a working repository somewhere that can map chunks back to files, no?
I can probably just create a repo that has no content, tar it up, and store it on my backup medium (or on bitbucket or wherever), but that seems kinda hackish--it'd be nice to handle this within git-annex. In fact, it'd be really neat if I could handle this with any existing special remote--for example, if there were a way to commit and restore the git repo state (and symlink tree) to the remote. But that doesn't seem to exist. Is there a recommended approach for this? Am I just missing something obvious?
Thanks.

View file

@ -0,0 +1,21 @@
I've found that running git annex add on a directory in a direct repository freezes. Example output:
> git annex add Signs\ \(2002\ Film\) --debug
[2015-02-22 10:10:04 GMT] read: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","ls-files","--others","--exclude-standard","-z","--","Signs (2002 Film)"]
[2015-02-22 10:10:04 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","cat-file","--batch"]
add Signs (2002 Film)/VIDEO_TS/VIDEO_TS.BUP [2015-02-22 10:10:04 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","check-attr","-z","--stdin","annex.backend","annex.numcopies","--"]
[2015-02-22 10:10:05 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","hash-object","-t","blob","-w","--stdin","--no-filters"]
[2015-02-22 10:10:05 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","cat-file","--batch"]
ok
add Signs (2002 Film)/VIDEO_TS/VIDEO_TS.IFO [2015-02-22 10:10:05 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","hash-object","-t","blob","-w","--stdin","--no-filters"]
ok
Lots of files, ending in:
add Signs (2002 Film)/VIDEO_TS/VTS_13_1.VOB [2015-02-22 10:56:49 GMT] chat: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","hash-object","-t","blob","-w","--stdin","--no-filters"]
ok
[2015-02-22 10:56:49 GMT] read: git ["--git-dir=/Volumes/plato/Films/.git","--work-tree=/Volumes/plato/Films","-c","core.bare=false","ls-files","--modified","-z","--","Signs (2002 Film)"]
It then hung for just under two hours before I hit ctrl+C. The files are on a remote SMB server mounted via OS X (hence direct mode) and git annex is being run on an OS X machine. git version 2.3.0, git-annex version 5.20150205. Both installed using homebrew. Any thoughts?