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 2014-02-13 11:39:59 -04:00
commit 4675d45f8f
5 changed files with 227 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
doc/bugs/In_the_assistant__44___add_some_clarifications_near___34__Add_another_local_repository__34___for_the_case_of_adding_an_existing_repository.mdwn Normal file
View file

@ -0,0 +1,23 @@
### Please describe the problem.
The difference in consequences of `Add another local repository` in the *git-annex assistant* on an existing repository versus on a new directory are unclear.
### What steps will reproduce the problem?
Going to the "Add another local repository" in the *git-annex assistant* will make you confused if you want to add an existing repository.
### What version of git-annex are you using? On what operating system?
[[!format sh """
$ git annex version
git-annex version: 5.20140210-gd99db49
build flags: Assistant Webapp Pairing S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA
key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SHA256 SHA1 SHA512 SHA224 SHA384 WORM URL
remote types: git gcrypt S3 bup directory rsync web webdav tahoe glacier hook external
"""]]
Ubuntu 13.04
### Please provide any additional information below.
Ain't nobody here but us chickens.

73
doc/bugs/problems_with_android_and_gpg.mdwn Normal file
View file

@ -0,0 +1,73 @@
### Please describe the problem.
When my android phone tries to decode files downloaded from a ssh remote using shared encryption, gpg errors occur.
### What steps will reproduce the problem?
Setup is very similar to my other bug report in <https://git-annex.branchable.com/bugs/problems_with_android_and_xmpp/>.
Only difference is the location of the annex on the android side.
I have put it on the /data mount which uses ext4 to avoid the /sdcard fuse mount, which does not handle symlinks.
1) setup git annex via webapp on laptop:
* local annex
* remote annex via ssh with shared encryption (tried two different servers, one with and one without git-annex installed)
* share with my devices using jabber.me account
2) setup git annex via webapp on android:
* local annex in /data/data/ga.androidterm/annex (ext filesystem)
* share with my devices using jabber.me account
* ssh remote is automatically added via XMPP
3) add file to annex on linux, which gets uploaded to the ssh remote
4) symlink for file is created on phone and data downloaded, but never decrypted (see logs below)
### What version of git-annex are you using? On what operating system?
Ubunut Linux 12.04 with git-annex version:
* 5.20140127.1 (from PPA)
Android 4.2 (rooted) with git-annex version:
* 5.20140211-g556cfeb (from autobuilds)
### Please provide any additional information below.
full logs:
* linux: <http://pastebin.ca/2639929>
* android: <http://pastebin.ca/2639945>
most interesting parts:
[[!format sh """
#
# android:
#
gpg: can't open `/usr/local/share/gnupg/options.skel': No such file or directory
gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/secring.gpg.lock' done via O_EXCL
gpg: DBG: locking for `/sdcard/git-annex.home/.gnupg/pubring.gpg.lock' done via O_EXCL
gpg: decryption failed: bad key
# followed by just the last line for all further attemps
gpg: decryption failed: bad key
# gpg it self seems to be fine
root@android:/data/data/ga.androidterm # ./bin/gpg --version -v
gpg (GnuPG) 1.4.15
Copyright (C) 2013 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Home: ~/.gnupg
Supported algorithms:
Pubkey: RSA, RSA-E, RSA-S, ELG-E, DSA
Cipher: IDEA, 3DES, CAST5, BLOWFISH, AES, AES192, AES256, TWOFISH,
CAMELLIA128, CAMELLIA192, CAMELLIA256
Hash: MD5, SHA1, RIPEMD160, SHA256, SHA384, SHA512, SHA224
Compression: Uncompressed, ZIP, ZLIB
"""]]

82
doc/bugs/problems_with_android_and_xmpp.mdwn Normal file
View file

@ -0,0 +1,82 @@
### Please describe the problem.
When trying to sync my android phone with my linux laptop using the git annex assistant and XMPP no files are transferred.
### What steps will reproduce the problem?
1) setup git annex via webapp on laptop:
* local annex
* remote annex via ssh with shared encryption (tried two different servers, one with and one without git-annex installed)
* share with my devices using jabber.me account
2) setup git annex via webapp on android:
* local annex in /sdcard/annex (fuse filesystem without symlink support)
* share with my devices using jabber.me account
* ssh remote is automatically added via XMPP
3) add files to annex on linux, they get uploaded to the ssh remote
4) wait forever for any files from linux to download to phone
5) add files to annex on phone, they get uploaded to the ssh remote
4) wait forever for any files from phone to download to linux
### What version of git-annex are you using? On what operating system?
Ubunut Linux 12.04 with git-annex version:
* 5.20140127.1 (from PPA)
Android 4.2 (rooted) tried with git-annex versions:
* 5.20140209 (from http://downloads.kitenet.net/git-annex/android/current/4.0/)
* 5.20140211-g556cfeb (from autobuilds)
### Please provide any additional information below.
full logs:
(these do not show the uploads to the ssh remote, because I restarted to get clean and short logs, but the files are on the server and can be dropped and restored on the linux side manually)
* linux: <http://pastebin.ca/2639948>
* android: <http://pastebin.ca/2639952>
most interesting parts:
[[!format sh """
#
# linux:
#
[2014-02-13 13:11:27 CET] XMPPClient: Pairing with dorian in progress
[2014-02-13 13:11:28 CET] XMPPSendPack: Syncing with dorian
To xmpp::dorian@jabber.me
* [new branch] git-annex -> refs/synced/4ce7576f-6f02-4657-bab5-2f4c4a564ee7/ZG9yaWFuQGphYmJlci5tZQ==/git-annex
* [new branch] annex/direct/master -> refs/synced/4ce7576f-6f02-4657-bab5-2f4c4a564ee7/ZG9yaWFuQGphYmJlci5tZQ==/annex/direct/master
[2014-02-13 13:11:29 CET] XMPPSendPack: Syncing with dorian
Everything up-to-date
[2014-02-13 13:12:21 CET] XMPPSendPack: Syncing with dorian
Everything up-to-date
[2014-02-13 13:12:21 CET] XMPPSendPack: Syncing with dorian
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
#
# android:
#
[2014-02-13 13:16:25 CET] XMPPClient: sending: Pushing "d29" (ReceivePackOutput 2 "<elided>")
[2014-02-13 13:16:25 CET] XMPPClient: to client: d6/tigase-14134
[2014-02-13 13:18:22 CET] XMPPClient: received: ["Unknown message"]
[2014-02-13 13:18:25 CET] XMPPReceivePack: timeout waiting for git send-pack output via XMPP
fatal: The remote end hung up unexpectedly
[2014-02-13 13:18:25 CET] XMPPReceivePack: finished running push Pushing "d29" (StartingPush (UUID "4ce7576f-6f02-4657-bab5-2f4c4a564ee7")) True
[2014-02-13 13:18:25 CET] XMPPClient: sending: Pushing "d29" (ReceivePackDone (ExitFailure 128))
[2014-02-13 13:18:25 CET] XMPPClient: to client: d6/tigase-14134
"""]]

11
doc/bugs/problems_with_android_and_xmpp/comment_1_dd56eb74660a606c7db54861ec745cc6._comment Normal file
View file

@ -0,0 +1,11 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawm78jq1Uo-ZbyOPG3diJUWVvEiM0kyAcvk"
nickname="Dorian"
subject="further information"
date="2014-02-13T13:33:49Z"
content="""
I just tried moving the annex on the android phone to a different location, because I wasn't sure how git annex handles the /sdcard's fuse file system without symlinks...
So with the annex on the /data mount using ext I got a little further (and discovered a different problem <https://git-annex.branchable.com/bugs/problems_with_android_and_gpg/>).
"""]]

38
doc/bugs/rsync_transport:_username_not_respected.mdwn Normal file
View file

@ -0,0 +1,38 @@
### Please describe the problem.
I created an encrypted rsync remote with a username (user@host). The rsync command issued by git-annex doesn't contain the username. I solved the problem using .ssh/config.
### What steps will reproduce the problem?
[[!format sh """
# Add remote like that
git-annex initremote encrsync type=rsync rsyncurl=user@xxx.rsync.net:rsync/X keyid=0xXXX
# Sync it
git-annex sync --content
# You'll see
$> ps ax | grep rsync
30652 pts/3 S+ 0:00 /home/ganwell/bin/git-annex.linux//lib64/ld-linux-x86-64.so.2 --library-path /home/ganwell/bin/git-annex.linux//etc/ld.so.conf.d:/home/ganwell/bin/git-annex.linux//usr/lib/x86_64-linux-gnu/gconv:/home/ganwell/bin/git-annex.linux//usr/lib/x86_64-linux-gnu/libc:/home/ganwell/bin/git-annex.linux//usr/lib:/home/ganwell/bin/git-annex.linux//usr/lib/x86_64-linux-gnu:/home/ganwell/bin/git-annex.linux//lib64:/home/ganwell/bin/git-annex.linux//lib/x86_64-linux-gnu: /home/ganwell/bin/git-annex.linux/shimmed/rsync/rsync xxx.rsync.net:rsync/X/9fa/634/'GPGHMACSHA1--X/GPGHMACSHA1--X
"""]]
### What version of git-annex are you using? On what operating system?
OS: Linux
Ver: git-annex version: 5.20140210-g1e0a3ad
Type: prebuilt
### 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.
"""]]