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

move transfer already in progress message to warning

Browse source 
This makes it be displayed in the error-messages field with
--json-error-messages. And with --quiet, it will let it be displayed,
which makes sense because it's telling the user why what they requested
to do has failed to happen.
This commit is contained in:
Joey Hess 2021-10-27 14:46:21 -04:00
parent 1d0c07a3af
commit 55bfa414b3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Annex/Transfer.hs
View file

@ -132,7 +132,7 @@ runTransfer' ignorelock t afile stalldetection retrydecider transferaction =
(lck, inprogress) <- prep tfile createtfile mode (lck, inprogress) <- prep tfile createtfile mode
if inprogress && not ignorelock if inprogress && not ignorelock
then do then do
showNote "transfer already in progress, or unable to take transfer lock" warning "transfer already in progress, or unable to take transfer lock"
return observeFailure return observeFailure
else do else do
v <- retry 0 info metervar $ v <- retry 0 info metervar $

14
doc/bugs/addurl_failure_has_empty_error-messages/comment_4_74e37e96d01bfb8b9521000d5faa7e53._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2021-10-27T18:40:48Z"
content="""
Aha, that makes sense! addurl constructs a url-based Key to use while
downloading, and the key transfer machinery prevents redundant downloads
of the same Key at the same time.
Arguably, the problem is not where the message gets put, but that
it fails when adding an url to two different paths.
I have, though, moved that message so it will appear in error-messages.
"""]]