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

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

Browse source
This commit is contained in:
Joey Hess 2013-09-09 15:37:10 -04:00
commit f1156bda8f
8 changed files with 108 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/bugs/Error_creating_encrypted_cloud_repository:___34__internal_server_error__34__.mdwn
View file

@ -21,4 +21,4 @@ The operating system is Mac OS X 10.8.4, and the version of git-annex is 4.20130
# End of transcript or log.
"""]]
[[!meta title "OSX bundled gpg does not work with gpg.conf created by MacGPG"]]
[[!meta title="OSX bundled gpg does not work with gpg.conf created by MacGPG"]]

8
doc/bugs/Feature_request:___34__quvi__34___flag/comment_4_6092695d6afb1608447afe6f86e6fb83._comment Normal file
View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="RaspberryPie"
ip="96.44.189.102"
subject="comment 4"
date="2013-09-09T19:31:44Z"
content="""
That was fast!
"""]]

22
doc/bugs/__40__assistant__41___dependency_on_ssh-askpass_-_not_installed_automatically_on_xubuntu.mdwn Normal file
View file

@ -0,0 +1,22 @@
### Please describe the problem.
Using assistant via xfce's "Internet -> Git annex" menu item, trying to connect to an ssh server fails
### What steps will reproduce the problem?
Use xubuntu 13.04 and git-annex
### What version of git-annex are you using? On what operating system?
git-annex version: 3.20121112ubuntu2
xubuntu 13.04
### Please provide any additional information below.
if I "sudo apt-get install ssh-askpass", this gets resolved. I think this should be fixed in the ubuntu repository's program dependencies.
Also if I run "git-annex webapp" from the terminal, this doesn't happen because it will ask me for the password in the terminal.
[[!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
Failed to ssh to the server. Transcript: ssh_askpass: exec(/usr/bin/ssh-askpass): No such file or directory Permission denied, please try again. ssh_askpass: exec(/usr/bin/ssh-askpass): No such file or directory Received disconnect from xxx.xxx.xxx.xxx: 2: Too many authentication failures for <user>
# End of transcript or log.
"""]]

16
doc/bugs/git-annex_merge_stalls.mdwn Normal file
View file

@ -0,0 +1,16 @@
### Please describe the problem.
Running git-annex merge shows the output "git-annex merge ", followed by a blinking cursor. The command never seems to end.
### What steps will reproduce the problem?
### What version of git-annex are you using? On what operating system?
4.20130827-gd04d9bb on MacOS X Mountain Lion
### Please provide any additional information below.
dtruss output at https://www.dropbox.com/s/4b3yqn7ajfz5el2/annex-merge.log
[[!meta title="no indication when git-annex is stuck waiting for a lock"]]

17
doc/bugs/git-annex_merge_stalls/comment_1_31578a754945bdcb902c62ff58704bcb._comment Normal file
View file

@ -0,0 +1,17 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.255.110"
subject="comment 1"
date="2013-09-09T15:45:17Z"
content="""
The relevant part of the log is:
<pre>
65332/0x53591a: open(\"/Users/gsolsberry/annex/.git/annex/journal.lck\0\", 0x601, 0x1B6) = 8 0
65332/0x53591a: fcntl(0x8, 0x9, 0x107009D60) = -1 Err#-1
</pre>
waitToSetLock thinks fcntl is failing to lock the file due to something else having it locked, and retries, leading to the hang.
I'm told on irc that this was installed using the prebuilt image, and that a previous version of it didn't have the problem.
"""]]

10
doc/bugs/git-annex_merge_stalls/comment_2_f3b6bf180466b5931bfd20b2f0229422._comment Normal file
View file

@ -0,0 +1,10 @@
[[!comment format=mdwn
username="https://www.google.com/accounts/o8/id?id=AItOawl8B4Ima-VCCJ4y32Gvfii8EmvTyN9tFGM"
nickname="Glendon"
subject="comment 2"
date="2013-09-09T15:54:59Z"
content="""
With latest 20130909 version, the following log from git-annex merge:
https://www.dropbox.com/s/3hklzfsflpxuk5s/annex-merge.log.1
"""]]

18
doc/bugs/git-annex_merge_stalls/comment_3_ced9b0d724fb55c756106b64c3721003._comment Normal file
View file

@ -0,0 +1,18 @@
[[!comment format=mdwn
username="http://joeyh.name/"
ip="4.153.255.110"
subject="comment 3"
date="2013-09-09T19:35:25Z"
content="""
This problem cleared up after a reboot (and a crash, apparently).
<pre>
joeyh so, my thought is that perhaps you had a git-annex process before that was holding the lock.
joeyh for example, if you ran it and ctrl-z'd at just the right time, it could be suspended and holding the lock
joeyh (or the kernel coud have gotten confused, which given you also had a crash, who knows..)
dp sounds logical
joeyh forcing locks is always a problimatic thing
joeyh but git-annex could certianly notice if it seems to be stalled and print some useful messages
joeyh and maybe have a way to run with locks forced
</pre>
"""]]

16
doc/forum/git-annex:_status:_1_failed.mdwn Normal file
View file

@ -0,0 +1,16 @@
Hi
I have a 1 To repository on my local linux box
when i try :
git annex status
i get :
git-annex: /media/malima/nazare/.git/annex/tmp/0723300. Everywhere I Dub --: getFileStatus: does not exist (No such file or directory)
failed
how could i fix this issue ?
many thanks for help