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

Fix wording of message displayed when unable to get a file that is available in untrusted repositories.

Browse source
This commit is contained in:
Joey Hess 2015-01-16 13:29:54 -04:00
parent 3abb775855
commit 23d2519be1
4 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Remote.hs
View file

@ -272,11 +272,13 @@ keyPossibilities' key trusted = do
return (sortBy (comparing cost) validremotes, validtrusteduuids)
{- Displays known locations of a key. -}
showLocations :: Key -> [UUID] -> String -> Annex ()
showLocations key exclude nolocmsg = do
showLocations :: Bool -> Key -> [UUID] -> String -> Annex ()
showLocations separateuntrusted key exclude nolocmsg = do
u <- getUUID
uuids <- keyLocations key
untrusteduuids <- trustGet UnTrusted
untrusteduuids <- if separateuntrusted
then trustGet UnTrusted
else pure []
let uuidswanted = filteruuids uuids (u:exclude++untrusteduuids)
let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted)
ppuuidswanted <- prettyPrintUUIDs "wanted" uuidswanted