diff options
-rw-r--r-- | CHANGELOG | 2 | ||||
-rw-r--r-- | Storage/Local.hs | 7 |
2 files changed, 7 insertions, 2 deletions
@@ -2,6 +2,8 @@ keysafe (0.20161023) UNRELEASED; urgency=medium * The third keysafe server is now available, provided by Purism. * Change default for --port to 4242. + * Fix --check-server to not fail when the server has not had anything + stored on it yet. -- Joey Hess <id@joeyh.name> Sun, 23 Oct 2016 15:30:02 -0400 diff --git a/Storage/Local.hs b/Storage/Local.hs index 637a31b..c1dcea4 100644 --- a/Storage/Local.hs +++ b/Storage/Local.hs @@ -112,8 +112,11 @@ obscure section getsharedir = onError (ObscureFailure . show) $ do count :: Section -> GetShareDir -> IO CountResult count section getsharedir = onError (CountFailure . show) $ do dir <- getsharedir section - CountResult . genericLength . filter isShareFile - <$> getDirectoryContents dir + exists <- doesDirectoryExist dir + if exists + then CountResult . genericLength . filter isShareFile + <$> getDirectoryContents dir + else return (CountResult 0) move :: Section -> GetShareDir -> Storage -> IO [StoreResult] move section getsharedir storage = do |