diff options
Diffstat (limited to 'CmdLine')
| -rw-r--r-- | CmdLine/GitAnnexShell.hs | 2 | ||||
| -rw-r--r-- | CmdLine/Seek.hs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs index 6c212b24d..91cfd3ede 100644 --- a/CmdLine/GitAnnexShell.hs +++ b/CmdLine/GitAnnexShell.hs @@ -66,7 +66,7 @@ options = commonOptions ++ check u = unexpectedUUID expected u checkGCryptUUID expected = check =<< getGCryptUUID True =<< gitRepo where - check (Just u) | u == toUUID expected = noop + check (Just u) | u == toUUID expected = noop check Nothing = unexpected expected "uninitialized repository" check (Just u) = unexpectedUUID expected u unexpectedUUID expected u = unexpected expected $ "UUID " ++ fromUUID u diff --git a/CmdLine/Seek.hs b/CmdLine/Seek.hs index 397a48118..238ed4291 100644 --- a/CmdLine/Seek.hs +++ b/CmdLine/Seek.hs @@ -107,7 +107,7 @@ withFilesUnlocked' :: ([FilePath] -> Git.Repo -> IO ([FilePath], IO Bool)) -> (F withFilesUnlocked' typechanged a params = seekActions $ prepFiltered a unlockedfiles where - check f = liftIO (notSymlink f) <&&> + check f = liftIO (notSymlink f) <&&> (isJust <$> catKeyFile f <||> isJust <$> catKeyFileHEAD f) unlockedfiles = filterM check =<< seekHelper typechanged params @@ -165,7 +165,7 @@ withKeyOptions keyop fallbackop params = do Just k -> go auto $ return [k] _ -> error "Can only specify one of file names, --all, --unused, or --key" where - go True _ = error "Cannot use --auto with --all or --unused or --key" + go True _ = error "Cannot use --auto with --all or --unused or --key" go False a = do matcher <- Limit.getMatcher seekActions $ map (process matcher) <$> a |