Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
cdfa5c12c9
13 changed files with 198 additions and 7 deletions
|
|
@ -0,0 +1,26 @@
|
|||
###What steps will reproduce the problem?
|
||||
|
||||
Suppose you have two types of folders you want to sync on two machines, e.g. Images and Documents.
|
||||
|
||||
I already setup the Documents folders on both machines to sync using local pairing and they sync happily. Now I want to do the same and I execute the same steps again for the Images and I choose to not combine the Documents and Images repositories, but keep them separate.
|
||||
|
||||
###What is the expected output? What do you see instead?
|
||||
|
||||
The git repositories between both machines should be synced and all files should be transfered sucessfully between them.
|
||||
|
||||
Instead the one machine shows a message "Failed to sync with host1_Images" and in the log it says
|
||||
|
||||
[2013-04-15 15:57:22 CEST] PairListener: Syncing with host1_Images
|
||||
git-annex-shell: Only allowed to access ~/Documents not ~/Images/
|
||||
fatal: The remote end hung up unexpectedly
|
||||
Already up-to-date.
|
||||
|
||||
I do not know how to debug this further cause I do not understand where this access-permission is configured.
|
||||
|
||||
###What version of git-annex are you using? On what operating system?
|
||||
|
||||
Machine 1: Gentoo Linux with Git-annex 4.20130405 from haskell-overlay.
|
||||
Machine 2: Ubuntu 12.04 with Git-Annex 4.20130405 installed using cabal.
|
||||
|
||||
###Please provide any additional information below.
|
||||
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
[[!comment format=mdwn
|
||||
username="saironiq"
|
||||
ip="147.251.209.29"
|
||||
subject="comment 4"
|
||||
date="2013-04-15T10:35:36Z"
|
||||
content="""
|
||||
These symbol lookup errors appear right after i click 'keep the repositories separate', so I think there indeed is a connection. There's nothing else in the log, except this one line repeating over and over again.
|
||||
|
||||
>[2013-04-15 11:14:30 CEST] main: starting assistant version 4.20130324<br/>
|
||||
>Already up-to-date.</br>
|
||||
>
|
||||
>(scanning...) [2013-04-15 11:14:31 CEST] Watcher: Performing startup scan<br/>
|
||||
>Already up-to-date.<br/>
|
||||
>
|
||||
>(started...) [2013-04-15 12:14:30 CEST] NetWatcherFallback: Syncing with wolf, zyzyx<br/>
|
||||
>(Recording state in git...)<br/>
|
||||
>git-annex: Daemon is already running.<br/>
|
||||
>curl: symbol lookup error: /usr/lib/libssl.so.1.0.0: undefined symbol: EVP_idea_cbc<br/>
|
||||
>curl: symbol lookup error: /usr/lib/libssl.so.1.0.0: undefined symbol: EVP_idea_cbc<br/>
|
||||
>curl: symbol lookup error: /usr/lib/libssl.so.1.0.0: undefined symbol: EVP_idea_cbc<br/>
|
||||
>...
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
[[!comment format=mdwn
|
||||
username="saironiq"
|
||||
ip="147.251.209.29"
|
||||
subject="comment 5"
|
||||
date="2013-04-15T11:01:32Z"
|
||||
content="""
|
||||
Here's a full strace output (first symbol lookup error is on line #102681):<br/>
|
||||
[[https://dl.dropboxusercontent.com/u/62238161/webapp.log]]
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://pradermecker.myopenid.com/"
|
||||
ip="81.244.149.180"
|
||||
subject="comment 6"
|
||||
date="2013-04-15T19:59:00Z"
|
||||
content="""
|
||||
I can confirm I also get the error:
|
||||
curl: symbol lookup error: /usr/lib/libssl.so.1.0.0: undefined symbol: EVP_idea_cbc
|
||||
|
||||
What I mean by the UI is hanging is that after the last action, I can see that the page is never fully re-loaded. So to be more precise the reloading of the page never stops.
|
||||
|
||||
When I am bored waiting for the page to reload ;-) I can still use the UI in the situation I describe (left to assume the operation fails :-)
|
||||
|
||||
I believe @saironiq is right: the problem is related to the 64 bits version.
|
||||
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://pradermecker.myopenid.com/"
|
||||
ip="81.244.149.180"
|
||||
subject="comment 7"
|
||||
date="2013-04-15T20:39:20Z"
|
||||
content="""
|
||||
@joey just to make the connection clear, both @saironiq and I use the same git-annex package (bin package) from Arch linux AUR (@saironiq is the maintainer of the package)
|
||||
|
||||
I suspect all 64bits binary packages on Arch linux to exhibit problems.
|
||||
|
||||
The package is fetching the bin archive from your repo: so I actually dare to suspect that all recent 64bits versions have similar problems.
|
||||
|
||||
I have describe one problem but they are many, so it does not take long to realize that the apps is not working properly.
|
||||
|
||||
I guess it is a packaging problem (something is missing in <http://downloads.kitenet.net/git-annex/linux/current/git-annex-standalone-amd64.tar.gz>), not an application bug ?
|
||||
"""]]
|
||||
25
doc/bugs/assistant_hangs_during_commit.mdwn
Normal file
25
doc/bugs/assistant_hangs_during_commit.mdwn
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
What steps will reproduce the problem?
|
||||
|
||||
Use git-annex and add file to repo.
|
||||
|
||||
|
||||
What is the expected output? What do you see instead?
|
||||
|
||||
File is committed and added to annex.
|
||||
|
||||
Instead a command like this is run "git --git-dir=/home/jchu/annex/.git --work-tree=/home/jchu/annex commit --allow-empty-message -m --quiet" and for some reason git decides to open a COMMIT_EDITMSG file in my editor of choice "vim .git/COMMIT_EDITMSG". Since git annex doesn't give me access to the terminal, I don't see it.
|
||||
|
||||
Depending on when it happens, the web interface could refuse to start (if the commit hang happens on startup) or if it happens during regular operation, then everything looks fine but the web interface doesn't update after that.
|
||||
|
||||
|
||||
What version of git-annex are you using? On what operating system?
|
||||
|
||||
git-annex (binary release) 4.20130405
|
||||
git 1.8.2.1
|
||||
|
||||
On Arch Linux.
|
||||
|
||||
|
||||
Please provide any additional information below.
|
||||
|
||||
I'm not sure if the git interface has changed, but I do see that --allow-empty-message does still exist. If I run the git commit command (with a '' after the -m), it does indeed start up vim for me. Would we benefit from just making a custom commit message ("Commit from date YYYYMMDDTHHMMSSZ")?
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkZktNHFhxC1kYA9KKdKpYJO4clq9WDsjE"
|
||||
nickname="Jason"
|
||||
subject="comment 1"
|
||||
date="2013-04-15T15:58:04Z"
|
||||
content="""
|
||||
Or if that solution isn't acceptable, it seems that git commit has a --no-edit option that will guarantee that an editor isn't started.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
###What steps will reproduce the problem?
|
||||
|
||||
1. Start git annex webapp, and make new repository on two computers.
|
||||
1. Pair them as "Local computer"s, and they synchronize fine, a file created on one shows up on the other.
|
||||
1. Disconnect one of the computers from the network, and create a new file
|
||||
1. Check where the file is.
|
||||
|
||||
###What is the expected output? What do you see instead?
|
||||
|
||||
git annex whereis new file
|
||||
|
||||
shows the file being in both repositories, when in fact it has had no chance to get added to the one on the other computer, and is not in it.
|
||||
|
||||
|
||||
###What version of git-annex are you using? On what operating system?
|
||||
|
||||
Both 4.20130405 on Ubuntu 12.10
|
||||
|
||||
###Please provide any additional information below.
|
||||
|
||||
I noticed this first when using a USB drive to communicate between work and home. Making changes at home, it thought that the new files were now present at work, when the computer there is off, and a long way away.
|
||||
--Walter
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
[[!comment format=txt
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawln3ckqKx0x_xDZMYwa9Q1bn4I06oWjkog"
|
||||
nickname="Michael"
|
||||
subject="comment 2"
|
||||
date="2013-04-15T01:32:52Z"
|
||||
content="""
|
||||
I'm still somewhat confused about the following commit (which seems to suggest fsck in direct mode could actually checksum files):
|
||||
|
||||
commit 0da2507fd622120217cf03038b851b47c47ace53
|
||||
Author: Joey Hess <joey@kitenet.net>
|
||||
Date: Tue Jan 8 15:07:00 2013 -0400
|
||||
|
||||
improve direct mode fsck
|
||||
|
||||
An earlier commit (mislabeled) made direct mode fsck check file checksums.
|
||||
While it's expected for files to change at any time in direct mode, and so
|
||||
fsck cannot complain every time there's a checksum mismatch, it is possible
|
||||
for it to detect when a file does not *seem* to have changed, then check
|
||||
its checksum, and so detect disk corruption or other problems.
|
||||
|
||||
This commit improves that, by checking a second time, if the checksum
|
||||
fails, that the file is still not modified, before taking action. This way,
|
||||
a direct mode file can be modified while being fscked.
|
||||
|
||||
|
||||
"""]]
|
||||
|
|
@ -8,13 +8,13 @@ that watches for `~/.ssh/*.pub` to appear, and automatically adds all such
|
|||
keys to the keyring. In at least some cases, probably when it has no other
|
||||
key, it then tells ssh to go ahead and use that key. Astounding.
|
||||
|
||||
To avoid this, the assistant will store its keys in `~/.ssh/annex/`
|
||||
instead. gnome-keyring does not look there (verified in the source).
|
||||
If you use gnome-keyring and have set up a repository on a remote server
|
||||
with the assistant, I'd recommend moving the keys it set up and editing
|
||||
`~/.ssh/config` to point to their new location.
|
||||
To avoid this, the assistant will store its keys in <s>`~/.ssh/annex/`</s>
|
||||
`~/.ssh/git-annex/` instead. gnome-keyring does not look there (verified in
|
||||
the source). If you use gnome-keyring and have set up a repository on a
|
||||
remote server with the assistant, I'd recommend moving the keys it set up
|
||||
and editing `~/.ssh/config` to point to their new location.
|
||||
|
||||
gnome-keyring is not the only peice of software that has a bad
|
||||
gnome-keyring is not the only piece of software that has a bad
|
||||
interaction with git-annex. I've been working on a bug that makes git-annex
|
||||
fail to authenticate to ejabberd. ejabberd 2.1.10 got support for
|
||||
SCRAM-SHA-1, but its code violates the RFC, and chokes on an address
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ assistant, please instead fill in this poll on behalf of less technically
|
|||
adept friends or family -- what's preventing you from introducing them to
|
||||
the assistant?
|
||||
|
||||
[[!poll open=yes expandable=yes 8 "I'm using the assistant!" 26 "I need a Windows port" 30 "I need an Android port" 3 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 3 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 25 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 9 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 20 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 18 "Not yet in Debian sid amd64" 6 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 4 "No build yet for Nokia N9" 3 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 5 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 4 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 5 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package" 1 "Better documentation/walkthroughs on using git-annex within an existing git repo. AKA mixed use" 1 "Union mounts to have a single view of file collection on the network" 1 "Ubuntu PPA does not build with webapp" 1 "I set it up, but am confused about what I set up! It would be great to be able to start from scratch."]]
|
||||
[[!poll open=yes expandable=yes 8 "I'm using the assistant!" 27 "I need a Windows port" 30 "I need an Android port" 3 "I need an IPhone port (not holding my breath)" 2 "Well, it's still in beta..." 11 "I want to, but have not had the time to try it" 5 "Just inertia. I've got this dropbox/whatever that already works.." 3 "It's too hard to install (please say why in comments)" 2 "Perceived recent increase of bug reports and thus sitting it out." 25 "Initially the lack of direct-mode. Now concerns about the safety of direct mode. Perhaps after the next release." 9 "I haven't always well understood the differences between commandline operation & the assistant, so the differences would confuse me, and I found the command line more understandable & less scary. Now trying to learn to like & trust the assistant. :)" 20 "An Ubuntu PPA would be supercool! Thanks for your great work!!" 18 "Not yet in Debian sid amd64" 6 "Waiting for Fedora/CentOS rpm repository." 2 "throttling transfers, it upsets people when I saturate the connection" 2 "partial content" 1 "Not yet available in macports" 4 "No build yet for Nokia N9" 3 "Using only git-annex webapp to config does not seem to work: Create walkthough?" 5 "No build for OSX 10.6" 5 "Needs more focus on the UI." 1 "Just inertia. I don't have a Dropbox/whatever." 4 "Replaces files with a symlink mess." 2 "configurable option to only annex files meeting certian size or filename criteria" 4 "I'm really confused about how to make it sync with a remote NON-bare repository. I'm even afraid to try `git remote add`, since there is no clear method to completely forget a git-annex remote..." 5 "A build for te raspberry pi would be supercol!" 1 "Would be nice to exclude subfolders from the gui or through a config file" 1 "I wish I had transparently encrypted git repos in the cloud available, like jgit." 1 "too many inodes used in direct mode. maybe it's possible to keep more info as git objects instead?" 2 "I need to be able to restrict in which repo dirs changes get auto-committed" 1 "Provide .deb package" 1 "Better documentation/walkthroughs on using git-annex within an existing git repo. AKA mixed use" 1 "Union mounts to have a single view of file collection on the network" 1 "Ubuntu PPA does not build with webapp" 1 "I set it up, but am confused about what I set up! It would be great to be able to start from scratch."]]
|
||||
|
||||
Feel free to write in your own reasons, or add a comment to give me more info.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawkurjhi0CRJvgm7QNaZDWS9hitBtavqIpc"
|
||||
nickname="Bret"
|
||||
subject="Plans for two factor authentication or oath?"
|
||||
date="2013-04-15T00:58:04Z"
|
||||
content="""
|
||||
Are there plans to support google's two factor authentication? Right now I have to use an application specific password.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,12 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://cyprio.net/"
|
||||
nickname="oz"
|
||||
subject="versions?"
|
||||
date="2013-04-15T22:50:31Z"
|
||||
content="""
|
||||
Well, in the screencast it seems to work alright.
|
||||
|
||||
I only get a \"Syncing with laptop B\" on one side, nothing more happens. I'm not sure if there is a recommended version to follow this screencast, or if the versions need to match (I'm syncing between macos & linux/debian, and the mac packages are lagging behind).
|
||||
|
||||
My guess is that the assistant is simply \"not there yet\": using git-annex manually works just fine, but the assistant... ew. :/
|
||||
"""]]
|
||||
Loading…
Reference in a new issue