diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-03-15 21:34:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-03-15 21:34:13 -0400 |
| commit | 9d49fe2c172b135a1a3735827df014b5f45d99a2 (patch) | |
| tree | 32caea71926c1b05d9b1921a16f364f57fc3e62f /Upgrade.hs | |
| parent | 675ee89749ba2272d37b763078020b6e5f4cd380 (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 'Upgrade.hs')
| -rw-r--r-- | Upgrade.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Upgrade.hs b/Upgrade.hs index 3c16bcc86..7469d9ba7 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -13,6 +13,7 @@ import Control.Monad.State (liftIO) import Control.Monad (filterM, forM_) import System.Posix.Files import System.FilePath +import Data.Maybe import Content import Types @@ -74,7 +75,7 @@ getKeysPresent0' 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 $ |