summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Git.hs3
-rw-r--r--Remote/S3.hs4
2 files changed, 3 insertions, 4 deletions
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 984f9c88f..d0dedd4fd 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -14,7 +14,6 @@ import Control.Exception.Extensible
import Control.Monad.State (liftIO)
import qualified Data.Map as M
import System.Cmd.Utils
-import Control.Monad (filterM)
import RemoteClass
import Types
@@ -41,7 +40,7 @@ remote = RemoteType {
list :: Annex [Git.Repo]
list = do
g <- Annex.gitRepo
- filterM remoteNotIgnored $ Git.remotes g
+ return $ Git.remotes g
gen :: Git.Repo -> Maybe (M.Map String String) -> Annex (Remote Annex)
gen repo _ = do
diff --git a/Remote/S3.hs b/Remote/S3.hs
index b3a910639..260c1eee8 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -16,7 +16,7 @@ import qualified Data.ByteString.Lazy.Char8 as L
import qualified Data.Map as M
import Data.Maybe
import Data.String.Utils
-import Control.Monad (filterM, when)
+import Control.Monad (when)
import Control.Monad.State (liftIO)
import System.Environment
@@ -41,7 +41,7 @@ remote = RemoteType {
s3List :: Annex [Git.Repo]
s3List = do
g <- Annex.gitRepo
- filterM remoteNotIgnored $ findS3Remotes g
+ return $ findS3Remotes g
{- S3 remotes have a remote.<name>.annex-s3 config setting.
- Git.Repo does not normally generate remotes for things that