Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
212b6ef8e0
7 changed files with 91 additions and 2 deletions
|
|
@ -0,0 +1,10 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="Chris"
|
||||||
|
ip="89.14.216.1"
|
||||||
|
subject="Reason found"
|
||||||
|
date="2013-07-07T21:21:49Z"
|
||||||
|
content="""
|
||||||
|
I found the reason for the behavior. On the server, for non-interactive login shells, the right path to git-annex was not set and an old version that was installed by the OS was used instead. I've put the \"export $PATH\" at the right position in .bashrc and now it works. Sorry for the noise.
|
||||||
|
|
||||||
|
Best regards, Chris
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,60 @@
|
||||||
|
### Please describe the problem.
|
||||||
|
There is no git-annex-shell command in path and thus sync with ssh server fails. If I symlink /usr/bin/git-annex-shell -> /usr/bin/git-annex, it complains that key is already present in annex and errors out. There is executable git-annex-shell in server's ~/.ssh/
|
||||||
|
|
||||||
|
### What steps will reproduce the problem?
|
||||||
|
Start webapp to sync local repo with ssh server.
|
||||||
|
|
||||||
|
### What version of git-annex are you using? On what operating system?
|
||||||
|
git-annex 4.20130627 on Gentoo
|
||||||
|
|
||||||
|
### 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
|
||||||
|
|
||||||
|
[2013-07-08 17:28:48 EEST] main: starting assistant version 4.20130627
|
||||||
|
[2013-07-08 17:28:49 EEST] TransferScanner: Syncing with netbook_Lit, sigma_Lit
|
||||||
|
|
||||||
|
dbus failed; falling back to mtab polling (SocketError {socketErrorMessage = "connect: does not exist (Connection refused)", socketErrorFatal = True, socketErrorAddress = Just (Address "unix:abstract=/tmp/dbus-HBxh6EyMJ3,guid=adc3101676daede2a128013351daa535")})
|
||||||
|
Already up-to-date.
|
||||||
|
|
||||||
|
(scanning...) [2013-07-08 17:28:49 EEST] Watcher: Performing startup scan
|
||||||
|
Already up-to-date.
|
||||||
|
Already up-to-date.
|
||||||
|
|
||||||
|
|
||||||
|
(started...) Everything up-to-date
|
||||||
|
Everything up-to-date
|
||||||
|
bash: git-annex-shell: command not found
|
||||||
|
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
|
||||||
|
rsync error: remote command not found (code 127) at io.c(605) [sender=3.0.9]
|
||||||
|
bash: git-annex-shell: command not found
|
||||||
|
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
|
||||||
|
rsync error: remote command not found (code 127) at io.c(605) [sender=3.0.9]
|
||||||
|
|
||||||
|
|
||||||
|
[2013-07-08 17:50:23 EEST] main: starting assistant version 4.20130627
|
||||||
|
[2013-07-08 17:50:23 EEST] TransferScanner: Syncing with netbook_Lit, sigma_Lit
|
||||||
|
|
||||||
|
dbus failed; falling back to mtab polling (SocketError {socketErrorMessage = "connect: does not exist (Connection refused)", socketErrorFatal = True, socketErrorAddress = Just (Address "unix:abstract=/tmp/dbus-HBxh6EyMJ3,guid=adc3101676daede2a128013351daa535")})
|
||||||
|
Already up-to-date.
|
||||||
|
|
||||||
|
(scanning...) [2013-07-08 17:50:23 EEST] Watcher: Performing startup scan
|
||||||
|
Already up-to-date.
|
||||||
|
Already up-to-date.
|
||||||
|
|
||||||
|
|
||||||
|
(started...) Everything up-to-date
|
||||||
|
Everything up-to-date
|
||||||
|
git-annex-shell: key is already present in annex
|
||||||
|
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
|
||||||
|
rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9]
|
||||||
|
git-annex-shell: key is already present in annex
|
||||||
|
rsync: connection unexpectedly closed (0 bytes received so far) [sender]
|
||||||
|
rsync error: error in rsync protocol data stream (code 12) at io.c(605) [sender=3.0.9]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
# End of transcript or log.
|
||||||
|
"""]]
|
||||||
|
|
@ -4,4 +4,4 @@ Same as the desktop webapp, users will be able to enter a directory they
|
||||||
want the first time they run it, but to save typing on android, anything
|
want the first time they run it, but to save typing on android, anything
|
||||||
that gets enough votes will be included in a list of choices as well.
|
that gets enough votes will be included in a list of choices as well.
|
||||||
|
|
||||||
[[!poll open=yes expandable=yes 52 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
|
[[!poll open=yes expandable=yes 53 "/sdcard/annex" 5 "Whole /sdcard" 4 "DCIM directory (photos and videos only)" 1 "Same as for regular git-annex. ~/annex/"]]
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ locally paired systems, and remote servers with rsync.
|
||||||
Help me prioritize my work: What special remote would you most like
|
Help me prioritize my work: What special remote would you most like
|
||||||
to use with the git-annex assistant?
|
to use with the git-annex assistant?
|
||||||
|
|
||||||
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 30 "Google Drive"]]
|
[[!poll open=yes 16 "Amazon S3 (done)" 12 "Amazon Glacier (done)" 9 "Box.com (done)" 70 "My phone (or MP3 player)" 19 "Tahoe-LAFS" 7 "OpenStack SWIFT" 31 "Google Drive"]]
|
||||||
|
|
||||||
This poll is ordered with the options I consider easiest to build
|
This poll is ordered with the options I consider easiest to build
|
||||||
listed first. Mostly because git-annex already supports them and they
|
listed first. Mostly because git-annex already supports them and they
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="mildred"
|
||||||
|
ip="2a01:e35:2f7b:8350:225:22ff:fe40:fdfc"
|
||||||
|
subject="What happens to object database in direct mode?"
|
||||||
|
date="2013-07-08T13:27:21Z"
|
||||||
|
content="""
|
||||||
|
What happens to the object database (`.git/annex/objects`) when going to direct mode? Are the objects deleted, moved to another location, kept?
|
||||||
|
|
||||||
|
If the objects are kept, does it means that the file on the repository in direct mode is duplicated in the object database? If so, would it be relevant to use `cp --reflink=auto` to populate the working directory to enable copy on write on filesystems that supports it?
|
||||||
|
"""]]
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
[[!comment format=mdwn
|
||||||
|
username="http://joeyh.name/"
|
||||||
|
ip="4.153.254.222"
|
||||||
|
subject="comment 6"
|
||||||
|
date="2013-07-08T16:11:32Z"
|
||||||
|
content="""
|
||||||
|
`.git/annex/objects` does not typically contain any file contents in direct mode. The file contents are stored directly in the working tree.
|
||||||
|
"""]]
|
||||||
|
|
@ -39,6 +39,7 @@ brew update
|
||||||
brew install haskell-platform git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2
|
brew install haskell-platform git ossp-uuid md5sha1sum coreutils libgsasl gnutls libidn libgsasl pkg-config libxml2
|
||||||
brew link libxml2
|
brew link libxml2
|
||||||
cabal update
|
cabal update
|
||||||
|
mkdir $HOME/bin
|
||||||
PATH=$HOME/bin:$PATH
|
PATH=$HOME/bin:$PATH
|
||||||
PATH=$HOME/.cabal/bin:$PATH
|
PATH=$HOME/.cabal/bin:$PATH
|
||||||
cabal install c2hs --bindir=$HOME/bin
|
cabal install c2hs --bindir=$HOME/bin
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue