summaryrefslogtreecommitdiff
path: root/Remote
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2014-12-08 13:40:15 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2014-12-08 13:40:15 -0400
commit335024d92294bd9504e9e9cd42ec0a4addfc4d69 (patch)
tree0c1e596609df621b59fcf5b3ed3b94621676d02b /Remote
parent1285c91f8f9b3505b4c4137ee5d84c450468333b (diff)
add stub claimUrl
Diffstat (limited to 'Remote')
-rw-r--r--Remote/Bup.hs1
-rw-r--r--Remote/Ddar.hs1
-rw-r--r--Remote/Directory.hs3
-rw-r--r--Remote/External.hs5
-rw-r--r--Remote/GCrypt.hs1
-rw-r--r--Remote/Git.hs1
-rw-r--r--Remote/Glacier.hs3
-rw-r--r--Remote/Hook.hs3
-rw-r--r--Remote/Rsync.hs1
-rw-r--r--Remote/S3.hs3
-rw-r--r--Remote/Tahoe.hs3
-rw-r--r--Remote/Web.hs3
-rw-r--r--Remote/WebDAV.hs3
13 files changed, 22 insertions, 9 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 4f2ddf35a..8744aa357 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -74,6 +74,7 @@ gen r u c gc = do
, readonly = False
, mkUnavailable = return Nothing
, getInfo = return [("repo", buprepo)]
+ , claimUrl = Nothing
}
return $ Just $ specialRemote' specialcfg c
(simplyPrepare $ store this buprepo)
diff --git a/Remote/Ddar.hs b/Remote/Ddar.hs
index d73919bfd..a57f5f6c3 100644
--- a/Remote/Ddar.hs
+++ b/Remote/Ddar.hs
@@ -71,6 +71,7 @@ gen r u c gc = do
, readonly = False
, mkUnavailable = return Nothing
, getInfo = return [("repo", ddarrepo)]
+ , claimUrl = Nothing
}
ddarrepo = fromMaybe (error "missing ddarrepo") $ remoteAnnexDdarRepo gc
specialcfg = (specialRemoteCfg c)
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 2e9e013ab..d83ab2dae 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -68,7 +68,8 @@ gen r u c gc = do
remotetype = remote,
mkUnavailable = gen r u c $
gc { remoteAnnexDirectory = Just "/dev/null" },
- getInfo = return [("directory", dir)]
+ getInfo = return [("directory", dir)],
+ claimUrl = Nothing
}
where
dir = fromMaybe (error "missing directory") $ remoteAnnexDirectory gc
diff --git a/Remote/External.hs b/Remote/External.hs
index dca273d23..a8526566f 100644
--- a/Remote/External.hs
+++ b/Remote/External.hs
@@ -68,8 +68,9 @@ gen r u c gc = do
availability = avail,
remotetype = remote,
mkUnavailable = gen r u c $
- gc { remoteAnnexExternalType = Just "!dne!" }
- , getInfo = return [("externaltype", externaltype)]
+ gc { remoteAnnexExternalType = Just "!dne!" },
+ getInfo = return [("externaltype", externaltype)],
+ claimUrl = Nothing
}
where
externaltype = fromMaybe (error "missing externaltype") (remoteAnnexExternalType gc)
diff --git a/Remote/GCrypt.hs b/Remote/GCrypt.hs
index 9aa70d57e..43e3d8b16 100644
--- a/Remote/GCrypt.hs
+++ b/Remote/GCrypt.hs
@@ -122,6 +122,7 @@ gen' r u c gc = do
, remotetype = remote
, mkUnavailable = return Nothing
, getInfo = return $ gitRepoInfo r
+ , claimUrl = Nothing
}
return $ Just $ specialRemote' specialcfg c
(simplyPrepare $ store this rsyncopts)
diff --git a/Remote/Git.hs b/Remote/Git.hs
index 50c34a2bb..fdadac2d6 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -160,6 +160,7 @@ gen r u c gc
, remotetype = remote
, mkUnavailable = unavailable r u c gc
, getInfo = return $ gitRepoInfo r
+ , claimUrl = Nothing
}
unavailable :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
diff --git a/Remote/Glacier.hs b/Remote/Glacier.hs
index 99003f29a..5484a0d2f 100644
--- a/Remote/Glacier.hs
+++ b/Remote/Glacier.hs
@@ -68,7 +68,8 @@ gen r u c gc = new <$> remoteCost gc veryExpensiveRemoteCost
remotetype = remote,
mkUnavailable = return Nothing,
getInfo = includeCredsInfo c (AWS.creds u) $
- [ ("glacier vault", getVault c) ]
+ [ ("glacier vault", getVault c) ],
+ claimUrl = Nothing
}
specialcfg = (specialRemoteCfg c)
-- Disabled until jobList gets support for chunks.
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index f7c428e99..a84ee8554 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -61,7 +61,8 @@ gen r u c gc = do
remotetype = remote,
mkUnavailable = gen r u c $
gc { remoteAnnexHookType = Just "!dne!" },
- getInfo = return [("hooktype", hooktype)]
+ getInfo = return [("hooktype", hooktype)],
+ claimUrl = Nothing
}
where
hooktype = fromMaybe (error "missing hooktype") $ remoteAnnexHookType gc
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index a87d05a33..6e71cb2bb 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -84,6 +84,7 @@ gen r u c gc = do
, remotetype = remote
, mkUnavailable = return Nothing
, getInfo = return [("url", url)]
+ , claimUrl = Nothing
}
where
specialcfg = (specialRemoteCfg c)
diff --git a/Remote/S3.hs b/Remote/S3.hs
index 844d87902..42f4f1ffb 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -92,7 +92,8 @@ gen r u c gc = do
then Just ("internet archive item", iaItemUrl $ fromMaybe "unknown" $ getBucketName c)
else Nothing
, Just ("partsize", maybe "unlimited" (roughSize storageUnits False) (getPartSize c))
- ]
+ ],
+ claimUrl = Nothing
}
s3Setup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs
index 7dd231c06..8df590f57 100644
--- a/Remote/Tahoe.hs
+++ b/Remote/Tahoe.hs
@@ -85,7 +85,8 @@ gen r u c gc = do
availability = GloballyAvailable,
remotetype = remote,
mkUnavailable = return Nothing,
- getInfo = return []
+ getInfo = return [],
+ claimUrl = Nothing
}
tahoeSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)
diff --git a/Remote/Web.hs b/Remote/Web.hs
index 4d4b43c41..6ddf1a45a 100644
--- a/Remote/Web.hs
+++ b/Remote/Web.hs
@@ -63,7 +63,8 @@ gen r _ c gc =
availability = GloballyAvailable,
remotetype = remote,
mkUnavailable = return Nothing,
- getInfo = return []
+ getInfo = return [],
+ claimUrl = Nothing -- implicitly claims all urls
}
downloadKey :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool
diff --git a/Remote/WebDAV.hs b/Remote/WebDAV.hs
index 932ed81e0..6b56acca6 100644
--- a/Remote/WebDAV.hs
+++ b/Remote/WebDAV.hs
@@ -73,7 +73,8 @@ gen r u c gc = new <$> remoteCost gc expensiveRemoteCost
remotetype = remote,
mkUnavailable = gen r u (M.insert "url" "http://!dne!/" c) gc,
getInfo = includeCredsInfo c (davCreds u) $
- [("url", fromMaybe "unknown" (M.lookup "url" c))]
+ [("url", fromMaybe "unknown" (M.lookup "url" c))],
+ claimUrl = Nothing
}
chunkconfig = getChunkConfig c