diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-12-31 03:27:37 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-12-31 03:27:37 -0400 |
| commit | 8a33573caff38b557fdf60c9547a78a5cc8c4ddc (patch) | |
| tree | fed26c043272c62738a9e83357283535195c0397 /Remote | |
| parent | 6cd4c7efcdea9a8897aa6b9e2b30e7e3426574bc (diff) | |
better filtering out of special remotes
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 3 | ||||
| -rw-r--r-- | Remote/Directory.hs | 3 | ||||
| -rw-r--r-- | Remote/Git.hs | 3 | ||||
| -rw-r--r-- | Remote/Hook.hs | 3 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 3 | ||||
| -rw-r--r-- | Remote/S3real.hs | 3 | ||||
| -rw-r--r-- | Remote/Web.hs | 3 |
7 files changed, 14 insertions, 7 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index cbd5d584a..9311d18e5 100644 --- a/Remote/Bup.hs +++ b/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 diff --git a/Remote/Directory.hs b/Remote/Directory.hs index 7f78b2f49..e1b17c241 100644 --- a/Remote/Directory.hs +++ b/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 diff --git a/Remote/Git.hs b/Remote/Git.hs index e527fa4fe..2f2be5bee 100644 --- a/Remote/Git.hs +++ b/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 diff --git a/Remote/Hook.hs b/Remote/Hook.hs index 5c761f43b..08be1a0ee 100644 --- a/Remote/Hook.hs +++ b/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 diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 68566c52a..91a72e88e 100644 --- a/Remote/Rsync.hs +++ b/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 diff --git a/Remote/S3real.hs b/Remote/S3real.hs index b79939b90..23a589726 100644 --- a/Remote/S3real.hs +++ b/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 diff --git a/Remote/Web.hs b/Remote/Web.hs index e31539f88..c0d54132a 100644 --- a/Remote/Web.hs +++ b/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 |