summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-08-16 20:47:48 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-08-16 20:47:48 -0400
commit5000aba76e6f066fd310d9635ea4369f07684b86 (patch)
tree08030b2b98586aeafadbc565c7aef02735e51d2c
parent354c5f349bcd8c43b45191983dce4a6c7489e9ed (diff)
avoid namespace conflict
-rw-r--r--Command.hs2
-rw-r--r--Command/SetKey.hs2
2 files changed, 1 insertions, 3 deletions
diff --git a/Command.hs b/Command.hs
index 02bbd29d4..d3c1640ee 100644
--- a/Command.hs
+++ b/Command.hs
@@ -178,8 +178,6 @@ withKeys :: CommandSeekKeys
withKeys a params = return $ map (a . parse) params
where
parse p = fromMaybe (error "bad key") $ readKey p
-withTempFile :: CommandSeekStrings
-withTempFile a params = return $ map a params
withNothing :: CommandSeekNothing
withNothing a [] = return [a]
withNothing _ _ = error "This command takes no parameters."
diff --git a/Command/SetKey.hs b/Command/SetKey.hs
index f2a5259ba..807cbd5b9 100644
--- a/Command/SetKey.hs
+++ b/Command/SetKey.hs
@@ -20,7 +20,7 @@ command = [repoCommand "setkey" paramPath seek
"sets annexed content for a key using a temp file"]
seek :: [CommandSeek]
-seek = [withTempFile start]
+seek = [withStrings start]
{- Sets cached content for a key. -}
start :: CommandStartString