diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-11-30 15:35:53 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-11-30 15:35:53 -0400 |
| commit | 27d3f477274341984015970b2600aaa0578679f9 (patch) | |
| tree | 2a321bd8efddbc46ca54b4895c9970e06d1590fa | |
| parent | 6c4bf48e7176da9955e483b308d7cff4d86dc06f (diff) | |
tahoe: Include tahoe capabilities in whereis display.
| -rw-r--r-- | Remote/Tahoe.hs | 8 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Remote/Tahoe.hs b/Remote/Tahoe.hs index 2ced67e30..5c28773ae 100644 --- a/Remote/Tahoe.hs +++ b/Remote/Tahoe.hs @@ -75,7 +75,7 @@ gen r u c gc = do , lockContent = Nothing , checkPresent = checkKey u hdl , checkPresentCheap = False - , whereisKey = Nothing + , whereisKey = Just (getWhereisKey u) , remoteFsck = Nothing , repairRepo = Nothing , config = c @@ -231,6 +231,12 @@ storeCapability u k cap = setRemoteState u k cap getCapability :: UUID -> Key -> Annex (Maybe Capability) getCapability u k = getRemoteState u k +getWhereisKey :: UUID -> Key -> Annex [String] +getWhereisKey u k = disp <$> getCapability u k + where + disp Nothing = [] + disp (Just c) = [c] + {- tahoe put outputs a single line, containing the capability. -} parsePut :: String -> Maybe Capability parsePut s = case lines s of diff --git a/debian/changelog b/debian/changelog index 55f195dc4..282e54710 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ git-annex (5.20151117) UNRELEASED; urgency=medium * When core.sharedRepository is set, annex object files are not made mode 444, since that prevents a user other than the file owner from locking them. Instead, a mode such as 664 is used in this case. + * tahoe: Include tahoe capabilities in whereis display. -- Joey Hess <id@joeyh.name> Mon, 16 Nov 2015 16:49:34 -0400 |