From: Joey Hess <joeyh@joeyh.name>
Date: Wed, 27 Aug 2025 13:11:49 +0000 (-0400)
Subject: Improved error message when yt-dlp is not installed and is needed to get a file from... 
X-Git-Tag: archive/raspbian/10.20251029-1+rpi1~1^2~3^2~181
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=10e5e2e8803629baae28d177f48c79e036e2eb00;p=git-annex.git

Improved error message when yt-dlp is not installed and is needed to get a file from the web
---

diff --git a/Annex/YoutubeDl.hs b/Annex/YoutubeDl.hs
index 722823b60b..9015928078 100644
--- a/Annex/YoutubeDl.hs
+++ b/Annex/YoutubeDl.hs
@@ -60,8 +60,7 @@ youtubeDlNotAllowedMessage = unwords
 --
 -- Displays a progress meter as youtube-dl downloads.
 --
--- If no file is downloaded, or the program is not installed,
--- returns Right Nothing.
+-- If no file is downloaded, returns Right Nothing.
 --
 -- youtube-dl can write to multiple files, either temporary files, or
 -- multiple videos found at the url, and git-annex needs only one file.
@@ -93,7 +92,7 @@ youtubeDl' url workdir p uo
 					[] -> return (Right Nothing)
 					_ -> return (Left $ cmd ++ " download is incomplete. Run the command again to resume.")
 				Left msg -> return (Left msg)
-			, return (Right Nothing)
+			, return (Left $ cmd ++ " is not installed.")
 			)
 	| otherwise = return (Right Nothing)
   where
diff --git a/CHANGELOG b/CHANGELOG
index 1e43b9638f..013b46c2e5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -30,6 +30,8 @@ git-annex (10.20250722) UNRELEASED; urgency=medium
   * tahoe: Fix bug that made initremote require an encryption= parameter,
     despite git-annex encryption not being used with this special remote.
     Fixes reversion introduced in version 7.20191230.
+  * Improved error message when yt-dlp is not installed and is needed to
+    get a file from the web.
   * Removed support for git versions older than 2.22.
   * Bump aws build dependency to 0.24.1.
   * stack.yaml: Update to lts-24.2.