From 22d9b320b1ecdd5d36fbe9cd71057cdf58f8775f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 21 Jan 2022 13:15:32 -0400 Subject: [PATCH] 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 --- Upgrade/V9.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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