better filtering out of special remotes

Remote/Bup.hs

@@ -54,7 +54,8 @@ gen r u c = do
 			hasKey = checkPresent r bupr',
 			hasKeyCheap = bupLocal buprepo,
 			config = c,
-			repo = r
+			repo = r,
+			remotetype = remote
 		}
 
 bupSetup :: UUID -> RemoteConfig -> Annex RemoteConfig

Remote/Directory.hs

@@ -45,7 +45,8 @@ gen r u c = do
 			hasKey = checkPresent dir,
 			hasKeyCheap = True,
 			config = Nothing,
-			repo = r
+			repo = r,
+			remotetype = remote
 		}
 
 directorySetup :: UUID -> RemoteConfig -> Annex RemoteConfig

Remote/Git.hs

@@ -79,7 +79,8 @@ gen r u _ = do
 		hasKey = inAnnex r',
 		hasKeyCheap = cheap,
 		config = Nothing,
-		repo = r'
+		repo = r',
+		remotetype = remote
 	}
 
 {- Tries to read the config for a specified remote, updates state, and

Remote/Hook.hs

@@ -45,7 +45,8 @@ gen r u c = do
 			hasKey = checkPresent r hooktype,
 			hasKeyCheap = False,
 			config = Nothing,
-			repo = r
+			repo = r,
+			remotetype = remote
 		}
 
 hookSetup :: UUID -> RemoteConfig -> Annex RemoteConfig

Remote/Rsync.hs

@@ -52,7 +52,8 @@ gen r u c = do
 			hasKey = checkPresent r o,
 			hasKeyCheap = False,
 			config = Nothing,
-			repo = r
+			repo = r,
+			remotetype = remote
 		}
 
 genRsyncOpts :: Git.Repo -> Annex RsyncOpts

Remote/S3real.hs

@@ -57,7 +57,8 @@ gen' r u c cst =
 			hasKey = checkPresent this,
 			hasKeyCheap = False,
 			config = c,
-			repo = r
+			repo = r,
+			remotetype = remote
 		}
 
 s3Setup :: UUID -> RemoteConfig -> Annex RemoteConfig

Remote/Web.hs

@@ -43,7 +43,8 @@ gen r _ _ =
 		hasKey = checkKey,
 		hasKeyCheap = False,
 		config = Nothing,
-		repo = r
+		repo = r,
+		remotetype = remote
 	}
 
 downloadKey :: Key -> FilePath -> Annex Bool