From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 21 Jan 2022 17:15:32 +0000 (-0400)
Subject: don't fail git-annex upgrade to v10
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~53^2~324
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=22d9b320b1ecdd5d36fbe9cd71057cdf58f8775f;p=git-annex.git

don't fail git-annex upgrade to v10

That left the repo in v8, but with filter.annex.process set. Instead,
only warn, and defer the v10 upgrade.

Sponsored-by: Dartmouth College's Datalad project
---

diff --git a/Upgrade/V9.hs b/Upgrade/V9.hs
index 92cc12adf8..86ceb4c3f9 100644
--- a/Upgrade/V9.hs
+++ b/Upgrade/V9.hs
@@ -28,7 +28,9 @@ upgrade automatic
 		, performUpgrade automatic
 		)
 	| otherwise = ifM (oldprocessesdanger <&&> (not <$> Annex.getState Annex.force))
-		( giveup $ unlines unsafeupgrade
+		( do
+			warning $ unlines unsafeupgrade
+			return UpgradeDeferred
 		, performUpgrade automatic
 		)
   where