mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

avoid namespace conflict

Browse source
This commit is contained in:
Joey Hess 2011-08-16 20:47:48 -04:00
parent 354c5f349b
commit 5000aba76e
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command.hs
View file

@ -178,8 +178,6 @@ withKeys :: CommandSeekKeys
withKeys a params = return $ map (a . parse) params withKeys a params = return $ map (a . parse) params
where where
parse p = fromMaybe (error "bad key") $ readKey p parse p = fromMaybe (error "bad key") $ readKey p
withTempFile :: CommandSeekStrings
withTempFile a params = return $ map a params
withNothing :: CommandSeekNothing withNothing :: CommandSeekNothing
withNothing a [] = return [a] withNothing a [] = return [a]
withNothing _ _ = error "This command takes no parameters." withNothing _ _ = error "This command takes no parameters."

2
Command/SetKey.hs
View file

@ -20,7 +20,7 @@ command = [repoCommand "setkey" paramPath seek
"sets annexed content for a key using a temp file"] "sets annexed content for a key using a temp file"]
seek :: [CommandSeek] seek :: [CommandSeek]
seek = [withTempFile start] seek = [withStrings start]
{- Sets cached content for a key. -} {- Sets cached content for a key. -}
start :: CommandStartString start :: CommandStartString