git-annex 5.20140107 → 5.20140108

raw patch · 9 files changed

+57/−9 lines, 9 files

Files

• Assistant/Alert/Utility.hs +2/−2
• Assistant/DaemonStatus.hs +2/−2
• Assistant/ScanRemotes.hs +1/−1
• Assistant/TransferQueue.hs +2/−2
• Utility/TList.hs +3/−0
• doc/bugs/amd64_i386_standalone:_no_SKEIN.mdwn +38/−0
• doc/forum/Lyve_Home.mdwn +6/−0
• doc/install/ArchLinux.mdwn +2/−1
• git-annex.cabal +1/−1

@@ -13,7 +13,7 @@  import qualified Data.Text as T import Data.Text (Text)-import qualified Data.Map.Strict as M+import qualified Data.Map as M  {- This is as many alerts as it makes sense to display at a time.  - A display might be smaller, or larger, the point is to not overwhelm the@@ -122,7 +122,7 @@ 	 		let (f, rest) = partition (\(_, a) -> isFiller a) l 			in drop bloat f ++ rest 	updatePrune = pruneBloat $ M.filterWithKey pruneSame $-		M.insert i al m+		M.insertWith' const i al m 	updateCombine combiner =  		let combined = M.mapMaybe (combiner al) m 		in if M.null combined

@@ -25,7 +25,7 @@ import Data.Time.Clock.POSIX import Data.Time import System.Locale-import qualified Data.Map.Strict as M+import qualified Data.Map as M import qualified Data.Text as T  getDaemonStatus :: Assistant DaemonStatus@@ -171,7 +171,7 @@  - or if already present, updates it while preserving the old transferTid,  - transferPaused, and bytesComplete values, which are not written to disk. -} updateTransferInfo :: Transfer -> TransferInfo -> Assistant ()-updateTransferInfo t info = updateTransferInfo' $ M.insertWith merge t info+updateTransferInfo t info = updateTransferInfo' $ M.insertWith' merge t info   where 	merge new old = new 		{ transferTid = maybe (transferTid new) Just (transferTid old)

@@ -13,7 +13,7 @@  import Data.Function import Control.Concurrent.STM-import qualified Data.Map.Strict as M+import qualified Data.Map as M  {- Blocks until there is a remote or remotes that need to be scanned.  -

@@ -34,7 +34,7 @@ import Utility.TList  import Control.Concurrent.STM-import qualified Data.Map.Strict as M+import qualified Data.Map as M import qualified Data.Set as S  type Reason = String@@ -191,7 +191,7 @@ 				if acceptable info 					then do 						adjustTransfersSTM dstatus $-							M.insert t info+							M.insertWith' const t info 						return $ Just r 					else return Nothing 

@@ -3,6 +3,9 @@  - Based on DLists, a transactional list can quickly and efficiently  - have items inserted at either end, or a whole list appended to it.  -+ - Unlike a TQueue, the entire contents of a TList can be efficiently+ - read without modifying it.+ -  - Copyright 2013 Joey Hess <joey@kitenet.net>  -} 

@@ -0,0 +1,38 @@+### Please describe the problem.++git-annex standalone has no SKEIN backends on i386 and amd64. OSX and Android standalones have them, debian package had it in version 4.20131106 and probably still does.++### What steps will reproduce the problem?++1. download git-annex standalone for amd64 or i386+2. extract+3. git-annex.linux/git-annex version++Expect key/value backends row to mention SKEIN. It does on other platforms, but not here.++Trying to e.g. get SKEIN-hashed files produces error messages.++### What version of git-annex are you using? On what operating system?+amd64 and i386 standalones 5.20140103 on Ubuntu Precise/12.04 (Mint 13)++### Please provide any additional information below.++[[!format sh """+clacke@acozed:~$ /usr/bin/git-annex version+git-annex version: 4.20131106+build flags: Assistant Webapp Pairing Testsuite S3 WebDAV Inotify DBus XMPP Feeds Quvi TDFA CryptoHash+key/value backends: SHA256E SHA1E SHA512E SHA224E SHA384E SKEIN256E SKEIN512E SHA256 SHA1 SHA512 SHA224 SHA384 SKEIN256 SKEIN512 WORM URL+remote types: git gcrypt S3 bup directory rsync web webdav glacier hook+clacke@acozed:~$ ~/.local/libexec/git-annex.linux-5.20140103/git-annex version+git-annex version: 5.20131230-g4aa88d8+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 glacier hook external+clacke@acozed:~$ ~/.local/libexec/git-annex.linux-5.20140103_i386/git-annex version+git-annex version: 5.20131230-g52a46585+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 glacier hook external+"""]]++-- [[clacke]]

@@ -0,0 +1,6 @@+Lyve Home is an interesting device to store personal photos and videos. It is a 2TB hard drive that stores all your photos. It tries to replicate the files on every device you connect (computer, phone, etc.) and keeps at least two copies of each photo. The photos are not stored in the cloud, Lyve only stores metadata in the cloud.++http://www.youtube.com/watch?v=sOE5uWqS6YQ++This is something that could be easily made with git-annex and a small computer, like a Raspberry Pi, and a hard drive. +

@@ -14,6 +14,7 @@ If it doesn't work, you can just use cabal:  <pre>-pacman -S git rsync curl wget gpg openssh cabal-install+pacman -S git rsync curl wget gnupg openssh cabal-install+cabal update cabal install git-annex --bindir=$HOME/bin </pre>

@@ -1,5 +1,5 @@ Name: git-annex-Version: 5.20140107+Version: 5.20140108 Cabal-Version: >= 1.8 License: GPL-3 Maintainer: Joey Hess <joey@kitenet.net>