summaryrefslogtreecommitdiff
path: root/Command/InAnnex.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-03-15 21:34:13 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-03-15 21:34:13 -0400
commit9d49fe2c172b135a1a3735827df014b5f45d99a2 (patch)
tree32caea71926c1b05d9b1921a16f364f57fc3e62f /Command/InAnnex.hs
parent675ee89749ba2272d37b763078020b6e5f4cd380 (diff)
first pass at using new keys
It compiles. It sorta works. Several subcommands are FIXME marked and broken, because things that used to accept separate --backend and --key params need to be changed to accept just a --key that encodes all the key info, now that there is metadata in keys.
Diffstat (limited to 'Command/InAnnex.hs')
-rw-r--r--Command/InAnnex.hs9
1 files changed, 7 insertions, 2 deletions
diff --git a/Command/InAnnex.hs b/Command/InAnnex.hs
index 68ac9a2c6..4a4102754 100644
--- a/Command/InAnnex.hs
+++ b/Command/InAnnex.hs
@@ -11,9 +11,10 @@ import Control.Monad.State (liftIO)
import System.Exit
import Command
-import Types
import Content
import qualified Backend
+import qualified BackendTypes
+import Key
command :: [Command]
command = [Command "inannex" (paramRepeating paramKey) seek
@@ -25,7 +26,11 @@ seek = [withKeys start]
start :: CommandStartString
start keyname = do
backends <- Backend.list
- let key = genKey (head backends) keyname
+ let key = stubKey {
+ keyName = keyname,
+ keyBackendName = BackendTypes.name (head backends)
+ }
+ error "BROKEN. fixme!"
present <- inAnnex key
if present
then return Nothing