set ANNEX_HASH_* always

This commit is contained in:
Joey Hess 2011-04-29 14:04:20 -04:00
parent ecdc08dbe1
commit cf501d3b9b

View file

@ -69,16 +69,16 @@ hookSetup u c = do
return c' return c'
hookEnv :: Key -> Maybe FilePath -> Maybe [(String, String)] hookEnv :: Key -> Maybe FilePath -> Maybe [(String, String)]
hookEnv k f = Just $ keyenv : fileenv f hookEnv k f = Just $ fileenv f ++ keyenv
where where
env s v = ("ANNEX_" ++ s, v) env s v = ("ANNEX_" ++ s, v)
keyenv = env "KEY" (show k) keyenv =
fileenv Nothing = [] [ env "KEY" (show k)
fileenv (Just file) =
[ env "FILE" file
, env "HASH_1" (hashbits !! 0) , env "HASH_1" (hashbits !! 0)
, env "HASH_2" (hashbits !! 1) , env "HASH_2" (hashbits !! 1)
] ]
fileenv Nothing = []
fileenv (Just file) = [env "FILE" file]
hashbits = map takeDirectory $ splitPath $ hashDirMixed k hashbits = map takeDirectory $ splitPath $ hashDirMixed k
lookupHook :: String -> String -> Annex (Maybe String) lookupHook :: String -> String -> Annex (Maybe String)