tahoe: Include tahoe capabilities in whereis display.
This commit is contained in:
parent
5effa61e0b
commit
f7d63a0117
2 changed files with 8 additions and 1 deletions
|
@ -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
|
||||
|
|
1
debian/changelog
vendored
1
debian/changelog
vendored
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue