From 58c89565e9f9b3a05b0b4ff33944b543d226c398 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 1 Nov 2010 22:50:53 -0400 Subject: [PATCH] updat --- Backend/SHA1.hs | 5 ++++- GitRepo.hs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Backend/SHA1.hs b/Backend/SHA1.hs index 76c368f84e..76869b071d 100644 --- a/Backend/SHA1.hs +++ b/Backend/SHA1.hs @@ -14,6 +14,7 @@ import System.IO import qualified Backend.File import TypeInternals +import Core backend :: Backend backend = Backend.File.backend { @@ -23,7 +24,9 @@ backend = Backend.File.backend { -- checksum the file to get its 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 let bits = split " " line if (null bits) diff --git a/GitRepo.hs b/GitRepo.hs index bc6d450664..244acda862 100644 --- a/GitRepo.hs +++ b/GitRepo.hs @@ -149,7 +149,7 @@ attributes repo {- Looks up a gitattributes value for each file in a list. -} checkAttr :: Repo -> String -> [FilePath] -> IO [(FilePath, String)] checkAttr repo attr files = do - (handle, s) <- pipeBoth "git" params files0 + (_, s) <- pipeBoth "git" params files0 return $ map topair $ lines s -- XXX handle is left open, this is ok for git-annex, but may need -- to be cleaned up for other uses.