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

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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Command/Drop.hs
View file

@ -156,7 +156,7 @@ notEnoughCopies key need have skip bad = do
show (length have) ++ " out of " ++ show (fromNumCopies need) ++ show (length have) ++ " out of " ++ show (fromNumCopies need) ++
" necessary copies" " necessary copies"
Remote.showTriedRemotes bad Remote.showTriedRemotes bad
Remote.showLocations key (have++skip) Remote.showLocations True key (have++skip)
"Rather than dropping this file, try using: git annex move" "Rather than dropping this file, try using: git annex move"
hint hint
return False return False

2
Command/Get.hs
View file

@ -79,7 +79,7 @@ getKeyFile' key afile dest = dispatch
( docopy r witness <||> trycopy full rs witness ( docopy r witness <||> trycopy full rs witness
, trycopy full rs witness , trycopy full rs witness
) )
showlocs = Remote.showLocations key [] showlocs = Remote.showLocations False key []
"No other repository is known to contain the file." "No other repository is known to contain the file."
-- This check is to avoid an ugly message if a remote is a -- This check is to avoid an ugly message if a remote is a
-- drive that is not mounted. -- drive that is not mounted.

8
Remote.hs
View file

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

2
debian/changelog vendored
View file

@ -10,6 +10,8 @@ git-annex (5.20150114) UNRELEASED; urgency=medium
made after two LOSTNET messages were received in a row (perhaps due to made after two LOSTNET messages were received in a row (perhaps due to
two different network interfaces being brought down). two different network interfaces being brought down).
* Fix build failure when wget is not installed. * Fix build failure when wget is not installed.
* Fix wording of message displayed when unable to get a file that
is available in untrusted repositories.
-- Joey Hess <id@joeyh.name> Tue, 13 Jan 2015 17:03:39 -0400 -- Joey Hess <id@joeyh.name> Tue, 13 Jan 2015 17:03:39 -0400