get: Improve output when failing to get a file fails
showTriedRemotes lists the remotes it tried to access. So there's no need to list those again in "Try making some of these remotes available".
This commit is contained in:
parent
7e9617ef47
commit
8d4eb2d34e
3 changed files with 5 additions and 3 deletions
|
@ -9,6 +9,7 @@ git-annex (8.20210128) UNRELEASED; urgency=medium
|
|||
such as "foo (bar or baz)", which was incorrectly handled as if
|
||||
it were "(foo or bar) and baz)" rather than the intended
|
||||
"foo and (bar or baz)"
|
||||
* get: Improve output when failing to get a file fails.
|
||||
|
||||
-- Joey Hess <id@joeyh.name> Thu, 28 Jan 2021 12:34:32 -0400
|
||||
|
||||
|
|
|
@ -92,7 +92,7 @@ getKey' key afile = dispatch
|
|||
where
|
||||
dispatch [] = do
|
||||
showNote "not available"
|
||||
showlocs
|
||||
showlocs []
|
||||
return False
|
||||
dispatch remotes = notifyTransfer Download afile $ \witness -> do
|
||||
ok <- pickRemote remotes $ \r -> ifM (probablyPresent r)
|
||||
|
@ -103,9 +103,9 @@ getKey' key afile = dispatch
|
|||
then return ok
|
||||
else do
|
||||
Remote.showTriedRemotes remotes
|
||||
showlocs
|
||||
showlocs (map Remote.uuid remotes)
|
||||
return False
|
||||
showlocs = Remote.showLocations False key []
|
||||
showlocs exclude = Remote.showLocations False key exclude
|
||||
"No other repository is known to contain the file."
|
||||
-- This check is to avoid an ugly message if a remote is a
|
||||
-- drive that is not mounted.
|
||||
|
|
|
@ -19,3 +19,4 @@ git-annex: get: 1 failed
|
|||
### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
|
||||
|
||||
mixed success
|
||||
> [[fixed|done]] --[[Joey]]
|
||||
|
|
Loading…
Reference in a new issue