From 55bfa414b3c10e89e13f5f354ab03beb6a570054 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 27 Oct 2021 14:46:21 -0400 Subject: [PATCH] move transfer already in progress message to warning 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. --- Annex/Transfer.hs | 2 +- ...ent_4_74e37e96d01bfb8b9521000d5faa7e53._comment | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 doc/bugs/addurl_failure_has_empty_error-messages/comment_4_74e37e96d01bfb8b9521000d5faa7e53._comment diff --git a/Annex/Transfer.hs b/Annex/Transfer.hs index c6597baec2..119c91b1af 100644 --- a/Annex/Transfer.hs +++ b/Annex/Transfer.hs @@ -132,7 +132,7 @@ runTransfer' ignorelock t afile stalldetection retrydecider transferaction = (lck, inprogress) <- prep tfile createtfile mode if inprogress && not ignorelock 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 else do v <- retry 0 info metervar $ diff --git a/doc/bugs/addurl_failure_has_empty_error-messages/comment_4_74e37e96d01bfb8b9521000d5faa7e53._comment b/doc/bugs/addurl_failure_has_empty_error-messages/comment_4_74e37e96d01bfb8b9521000d5faa7e53._comment new file mode 100644 index 0000000000..a276239e11 --- /dev/null +++ b/doc/bugs/addurl_failure_has_empty_error-messages/comment_4_74e37e96d01bfb8b9521000d5faa7e53._comment @@ -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. +"""]] -- 2.30.2