Merge branch 'master' of ssh://git-annex.branchable.com
This commit is contained in:
Joey Hess
commit
514a4efb7a
6 changed files with 164 additions and 1 deletions
|
|
@ -0,0 +1,8 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.68"
|
||||
subject="comment 10"
|
||||
date="2014-01-20T16:28:43Z"
|
||||
content="""
|
||||
I have updated the autobuild again, now nettle is built with more optimisations disabled. I hope this fixes it because I'm running out of things to try.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,93 @@
|
|||
### Please describe the problem.
|
||||
|
||||
Building a recent git-annex with cabal with the `minimal build'
|
||||
options given in the installation instructions fails. It is probably
|
||||
just a matter of fixing the dependencies in the cabal file.
|
||||
|
||||
### What steps will reproduce the problem?
|
||||
Compile with:
|
||||
|
||||
cabal install git-annex-5.20140108 --bindir=$HOME/bin -f"-assistant -webapp -webdav -pairing -xmpp -dns"
|
||||
|
||||
### What version of git-annex are you using? On what operating system?
|
||||
Linux 2.6.32-5-686 i686 GNU/Linux
|
||||
|
||||
|
||||
### 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
|
||||
Resolving dependencies...
|
||||
[ 1 of 27] Compiling Utility.PartialPrelude ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/PartialPrelude.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/PartialPrelude.o )
|
||||
[ 2 of 27] Compiling Utility.FileSystemEncoding ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/FileSystemEncoding.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/FileSystemEncoding.o )
|
||||
[ 3 of 27] Compiling Utility.Applicative ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Applicative.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Applicative.o )
|
||||
[ 4 of 27] Compiling Utility.Data ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Data.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Data.o )
|
||||
[ 5 of 27] Compiling Utility.Exception ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Exception.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Exception.o )
|
||||
[ 6 of 27] Compiling Utility.Tmp ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Tmp.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Tmp.o )
|
||||
[ 7 of 27] Compiling Utility.Env ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Env.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Env.o )
|
||||
[ 8 of 27] Compiling Utility.UserInfo ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/UserInfo.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/UserInfo.o )
|
||||
[ 9 of 27] Compiling Utility.OSX ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/OSX.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/OSX.o )
|
||||
[10 of 27] Compiling Utility.Monad ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Monad.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Monad.o )
|
||||
[11 of 27] Compiling Utility.Misc ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Misc.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Misc.o )
|
||||
[12 of 27] Compiling Utility.Process ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Process.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Process.o )
|
||||
[13 of 27] Compiling Utility.Path ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Path.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Path.o )
|
||||
[14 of 27] Compiling Utility.FreeDesktop ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/FreeDesktop.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/FreeDesktop.o )
|
||||
[15 of 27] Compiling Assistant.Install.AutoStart ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Assistant/Install/AutoStart.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Assistant/Install/AutoStart.o )
|
||||
[16 of 27] Compiling Utility.SafeCommand ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/SafeCommand.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/SafeCommand.o )
|
||||
[17 of 27] Compiling Utility.ExternalSHA ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/ExternalSHA.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/ExternalSHA.o )
|
||||
[18 of 27] Compiling Utility.Directory ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Utility/Directory.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Utility/Directory.o )
|
||||
[19 of 27] Compiling Common ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Common.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Common.o )
|
||||
[20 of 27] Compiling Git.Version ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Git/Version.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Git/Version.o )
|
||||
[21 of 27] Compiling Config.Files ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Config/Files.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Config/Files.o )
|
||||
[22 of 27] Compiling Assistant.Install.Menu ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Assistant/Install/Menu.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Assistant/Install/Menu.o )
|
||||
[23 of 27] Compiling Build.TestConfig ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Build/TestConfig.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Build/TestConfig.o )
|
||||
[24 of 27] Compiling Build.Version ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Build/Version.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Build/Version.o )
|
||||
[25 of 27] Compiling Build.Configure ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Build/Configure.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Build/Configure.o )
|
||||
[26 of 27] Compiling Build.DesktopFile ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Build/DesktopFile.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Build/DesktopFile.o )
|
||||
[27 of 27] Compiling Main ( /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/Setup.hs, /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/Main.o )
|
||||
Linking /tmp/git-annex-5.20140108-30015/git-annex-5.20140108/dist/setup/setup ...
|
||||
checking version...fatal: Not a git repository (or any of the parent directories): .git
|
||||
5.20140107
|
||||
checking UPGRADE_LOCATION... not available
|
||||
checking git... yes
|
||||
checking git version... 1.7.2.5
|
||||
checking cp -a... yes
|
||||
checking cp -p... yes
|
||||
checking cp --reflink=auto... yes
|
||||
checking xargs -0... yes
|
||||
checking rsync... yes
|
||||
checking curl... no
|
||||
checking wget... yes
|
||||
checking bup... no
|
||||
checking quvi... no
|
||||
checking newquvi... no
|
||||
checking nice... yes
|
||||
checking ionice... yes
|
||||
checking nocache... no
|
||||
checking gpg... gpg
|
||||
checking lsof... lsof
|
||||
checking git-remote-gcrypt... not available
|
||||
checking ssh connection caching... no
|
||||
checking sha1... sha1sum
|
||||
checking sha256... sha256sum
|
||||
checking sha512... sha512sum
|
||||
checking sha224... sha224sum
|
||||
checking sha384... sha384sum
|
||||
Configuring git-annex-5.20140108...
|
||||
Building git-annex-5.20140108...
|
||||
Preprocessing executable 'git-annex' for git-annex-5.20140108...
|
||||
|
||||
Remote/External.hs:29:8:
|
||||
Could not find module `Control.Concurrent.STM'
|
||||
It is a member of the hidden package `stm-2.4.2'.
|
||||
Perhaps you need to add `stm' to the build-depends in your .cabal file.
|
||||
Use -v to see a list of the files searched for.
|
||||
Failed to install git-annex-5.20140108
|
||||
cabal: Error: some packages failed to install:
|
||||
git-annex-5.20140108 failed during the building phase. The exception was:
|
||||
ExitFailure 1
|
||||
|
||||
|
||||
# End of transcript or log.
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://www.google.com/accounts/o8/id?id=AItOawm_YXzEdPHzbSGVwtmTR7g1BqDtTnIBB5s"
|
||||
nickname="Matthias"
|
||||
subject="Chunk it"
|
||||
date="2014-01-20T16:22:09Z"
|
||||
content="""
|
||||
> TODO: stream the file up/down the pipe, rather than using a temp file
|
||||
|
||||
You might want to use chunked transfer, i.e. a series of \"EXPECT 65536\" followed by that many bytes of binary data and an EOF marker (EXPECT-END or EXPECT 0), instead of escaping three characters (newline, NUL, and the escape prefix) and the additional unnecessary tedious per-character processing that would require.
|
||||
"""]]
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
Spent the day building this new feature, which makes `git annex sync`
|
||||
Spent the day building this new feature, which makes `git annex sync --content`
|
||||
do the same synchronization of file contents (to satisfy preferred content
|
||||
settings) that the assistant does. The result has not been tested a lot
|
||||
yet, but seems to work well.
|
||||
|
|
|
|||
|
|
@ -0,0 +1,42 @@
|
|||
[[!comment format=mdwn
|
||||
username="https://me.yahoo.com/a/FHnTlSBo1eCGJRwueeKeB6.RCaPbGMPr5jxx8A--#ce0d8"
|
||||
nickname="Hamza"
|
||||
subject="comment 2"
|
||||
date="2014-01-19T23:56:17Z"
|
||||
content="""
|
||||
I've tried,
|
||||
|
||||
git annex fsck --from external
|
||||
|
||||
and
|
||||
|
||||
git annex fsck --all --from external
|
||||
|
||||
did not solve the problem. Running,
|
||||
|
||||
strace git annex dropunused 1 --from external --force
|
||||
|
||||
tail of strace produces,
|
||||
|
||||
clone(child_stack=0, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidp
|
||||
tr=0x7f3a8d6d8a10) = 5746
|
||||
rt_sigaction(SIGINT, {0x4e1fb0, [INT], SA_RESTORER|SA_RESTART, 0x7f3a8c8b60b0}, {SIG_D
|
||||
FL, [], 0}, 8) = 0
|
||||
rt_sigaction(SIGHUP, {0x4e1fb0, [HUP], SA_RESTORER|SA_RESTART, 0x7f3a8c8b60b0}, {SIG_D
|
||||
FL, [], 0}, 8) = 0
|
||||
rt_sigaction(SIGTERM, {0x4e1fb0, [TERM], SA_RESTORER|SA_RESTART, 0x7f3a8c8b60b0}, {SIG
|
||||
_DFL, [], 0}, 8) = 0
|
||||
rt_sigaction(SIGQUIT, {0x4e1fb0, [QUIT], SA_RESTORER|SA_RESTART, 0x7f3a8c8b60b0}, {SIG
|
||||
_DFL, [], 0}, 8) = 0
|
||||
rt_sigaction(SIGPIPE, {0x4e1fb0, [PIPE], SA_RESTORER|SA_RESTART, 0x7f3a8c8b60b0}, {SIG
|
||||
_DFL, [], 0}, 8) = 0
|
||||
close(5) = 0
|
||||
read(4, \"\", 1) = 0
|
||||
close(4) = 0
|
||||
wait4(5746, dropunused 1 (from external...) (gpg) failed
|
||||
git-annex: dropunused: 1 failed
|
||||
[{WIFEXITED(s) && WEXITSTATUS(s) == 1}], 0, NULL) = 5746
|
||||
--- SIGCHLD (Child exited) @ 0 (0) ---
|
||||
exit_group(1) = ?
|
||||
|
||||
"""]]
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
[[!comment format=mdwn
|
||||
username="http://joeyh.name/"
|
||||
ip="209.250.56.68"
|
||||
subject="comment 3"
|
||||
date="2014-01-20T16:33:27Z"
|
||||
content="""
|
||||
I see you're using encryption. That could have something to do with the problem. Which type of encryption was used for this special remote? encryption=shared or one of the other options?
|
||||
|
||||
Look through the whole strace output for attempts to access the directory special remote and show those. Or put up the full strace somewhere.
|
||||
"""]]
|
||||
Loading…
Add table
Reference in a new issue