diff options
| author |  Joey Hess <joey@kitenet.net> | 2010-11-01 22:50:53 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-11-01 22:50:53 -0400 |
| commit | 58c89565e9f9b3a05b0b4ff33944b543d226c398 (patch) | |
| tree | e4872870d5479989bbf36c4854b3157db8584828 | |
| parent | 13514b6afc6cb043dfa742dd0e69efca7a4374df (diff) | |
updat
| -rw-r--r-- | Backend/SHA1.hs | 5 | ||||
| -rw-r--r-- | GitRepo.hs | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Backend/SHA1.hs b/Backend/SHA1.hs index 76c368f84..76869b071 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 bc6d45066..244acda86 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. |