rename key2file and file2key
What these generate is not really suitable to be used as a filename, which is why keyFile and fileKey further escape it. These are just serializing Keys. Also removed a quickcheck test that was very unlikely to test anything useful, since it relied on random chance creating something that looks like a serialized key. The other test is sufficient for testing what that was intended to test anyway.
This commit is contained in:
parent
ff0a2bee2d
commit
d3ab5e626b
40 changed files with 97 additions and 108 deletions
|
@ -92,7 +92,7 @@ hookEnv action k f = Just <$> mergeenv (fileenv f ++ keyenv)
|
|||
mergeenv l = addEntries l <$> getEnvironment
|
||||
envvar s v = ("ANNEX_" ++ s, v)
|
||||
keyenv = catMaybes
|
||||
[ Just $ envvar "KEY" (key2file k)
|
||||
[ Just $ envvar "KEY" (serializeKey k)
|
||||
, Just $ envvar "ACTION" action
|
||||
, envvar "HASH_1" <$> headMaybe hashbits
|
||||
, envvar "HASH_2" <$> headMaybe (drop 1 hashbits)
|
||||
|
@ -151,7 +151,7 @@ checkKey r h k = do
|
|||
liftIO $ check v
|
||||
where
|
||||
action = "checkpresent"
|
||||
findkey s = key2file k `elem` lines s
|
||||
findkey s = serializeKey k `elem` lines s
|
||||
check Nothing = giveup $ action ++ " hook misconfigured"
|
||||
check (Just hook) = do
|
||||
environ <- hookEnv action k Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue