From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 2 Feb 2024 19:57:07 +0000 (-0400)
Subject: fix importfeed --force skip behavior reversion
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~25^2~203
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2f3fe4d9041aed953e9a25b514d83bfa05fdb971;p=git-annex.git

fix importfeed --force skip behavior reversion

importfeed --force: Don't treat it as a failure when an already downloaded
file exists. (Fixes a behavior change introduced in 10.20230626.)

04ee6c4c6b2 caused the reversion. Inside a CommandPerform, stop causes it
to fail. Before that commit, it was inside a CommandStart, where stop
causes it to skip.
---

diff --git a/CHANGELOG b/CHANGELOG
index d0f759cc6a..2a751cfd7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@ git-annex (10.20240130) UNRELEASED; urgency=medium
 
   * importfeed: Added --scrape option, which uses yt-dlp to screen scrape
     the equivilant of an RSS feed.
+  * importfeed --force: Don't treat it as a failure when an already
+    downloaded file exists. (Fixes a behavior change introduced in
+    10.20230626.)
   * importfeed --force: Avoid creating duplicates of existing
     already downloaded files when yt-dlp or a special remote was used.
 
diff --git a/Command/ImportFeed.hs b/Command/ImportFeed.hs
index dbc8cb8bf0..a8d04ef2da 100644
--- a/Command/ImportFeed.hs
+++ b/Command/ImportFeed.hs
@@ -412,7 +412,7 @@ runDownload todownload url extension cache cv getter = do
 	case dest of
 		Nothing -> do
 			recordsuccess
-			stop
+			next $ return True
 		Just f -> getter (toRawFilePath f) >>= \case
 			Just ks
 				-- Download problem.