diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-11-28 22:43:51 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-11-28 22:43:51 -0400 |
| commit | da9cd315beb03570b96f83063a39e799fe01b166 (patch) | |
| tree | 61fdc79dd54dccf1792cf3ccadcc584e0119d077 /Remote/Hook.hs | |
| parent | 2b3c120506f1f25b4c3d0e19342b9826bde0b3b5 (diff) | |
add support for using hashDirLower in addition to hashDirMixed
Supporting multiple directory hash types will allow converting to a
different one, without a flag day.
gitAnnexLocation now checks which of the possible locations have a file.
This means more statting of files. Several places currently use
gitAnnexLocation and immediately check if the returned file exists;
those need to be optimised.
Diffstat (limited to 'Remote/Hook.hs')
| -rw-r--r-- | Remote/Hook.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 03976fc70..ab84533b2 100644 --- a/Remote/Hook.hs +++ b/Remote/Hook.hs @@ -97,12 +97,12 @@ runHook hooktype hook k f a = maybe (return False) run =<< lookupHook hooktype h store :: String -> Key -> Annex Bool store h k = do - src <- fromRepo $ gitAnnexLocation k + src <- inRepo $ gitAnnexLocation k runHook h "store" k (Just src) $ return True storeEncrypted :: String -> (Cipher, Key) -> Key -> Annex Bool storeEncrypted h (cipher, enck) k = withTmp enck $ \tmp -> do - src <- fromRepo $ gitAnnexLocation k + src <- inRepo $ gitAnnexLocation k liftIO $ withEncryptedContent cipher (L.readFile src) $ L.writeFile tmp runHook h "store" enck (Just tmp) $ return True |