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

updat

Browse source
This commit is contained in:
Joey Hess 2010-11-01 22:50:53 -04:00
parent 13514b6afc
commit 58c89565e9
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Backend/SHA1.hs
View file

@ -14,6 +14,7 @@ import System.IO
import qualified Backend.File import qualified Backend.File
import TypeInternals import TypeInternals
import Core
backend :: Backend backend :: Backend
backend = Backend.File.backend { backend = Backend.File.backend {
@ -23,7 +24,9 @@ backend = Backend.File.backend {
-- checksum the file to get its key -- checksum the file to get its key
keyValue :: FilePath -> Annex (Maybe Key) keyValue :: FilePath -> Annex (Maybe Key)
keyValue file = liftIO $ pOpen ReadFromPipe "sha1sum" [file] $ \h -> do keyValue file = do
showNote "checksum"
liftIO $ pOpen ReadFromPipe "sha1sum" [file] $ \h -> do
line <- hGetLine h line <- hGetLine h
let bits = split " " line let bits = split " " line
if (null bits) if (null bits)

2
GitRepo.hs
View file

@ -149,7 +149,7 @@ attributes repo
{- Looks up a gitattributes value for each file in a list. -} {- Looks up a gitattributes value for each file in a list. -}
checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)] checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)]
checkAttr repo attr files = do checkAttr repo attr files = do
(handle, s) <- pipeBoth "git" params files0 (_, s) <- pipeBoth "git" params files0
return $ map topair $ lines s return $ map topair $ lines s
-- XXX handle is left open, this is ok for git-annex, but may need -- XXX handle is left open, this is ok for git-annex, but may need
-- to be cleaned up for other uses. -- to be cleaned up for other uses.