mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

tahoe: Include tahoe capabilities in whereis display.

Browse source
This commit is contained in:
Joey Hess 2015-11-30 15:35:53 -04:00
parent 5effa61e0b
commit f7d63a0117
Failed to extract signature
2 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Remote/Tahoe.hs
View file

@ -75,7 +75,7 @@ gen r u c gc = do
, lockContent = Nothing , lockContent = Nothing
, checkPresent = checkKey u hdl , checkPresent = checkKey u hdl
, checkPresentCheap = False , checkPresentCheap = False
, whereisKey = Nothing , whereisKey = Just (getWhereisKey u)
, remoteFsck = Nothing , remoteFsck = Nothing
, repairRepo = Nothing , repairRepo = Nothing
, config = c , config = c
@ -231,6 +231,12 @@ storeCapability u k cap = setRemoteState u k cap
getCapability :: UUID -> Key -> Annex (Maybe Capability) getCapability :: UUID -> Key -> Annex (Maybe Capability)
getCapability u k = getRemoteState u k 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. -} {- tahoe put outputs a single line, containing the capability. -}
parsePut :: String -> Maybe Capability parsePut :: String -> Maybe Capability
parsePut s = case lines s of parsePut s = case lines s of

1
debian/changelog vendored
View file

@ -9,6 +9,7 @@ git-annex (5.20151117) UNRELEASED; urgency=medium
* When core.sharedRepository is set, annex object files are not made mode * 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 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. 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 -- Joey Hess <id@joeyh.name> Mon, 16 Nov 2015 16:49:34 -0400