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.

1 files changed, 2 insertions, 1 deletions

diff --git a/Content.hs b/Content.hs
index dc675389f..1a5a80a9f 100644
--- a/Content.hs
+++ b/Content.hs
@@ -26,6 +26,7 @@ import System.Path
 import Control.Monad (when, unless, filterM)
 import System.Posix.Files
 import System.FilePath
+import Data.Maybe
 
 import Types
 import Locations
@@ -162,7 +163,7 @@ getKeysPresent' dir = do
 		else do
 			contents <- liftIO $ getDirectoryContents dir
 			files <- liftIO $ filterM present contents
-			return $ map fileKey files
+			return $ catMaybes $ map fileKey files
 	where
 		present d = do
 			result <- try $