From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 25 Jul 2022 20:13:46 +0000 (-0400)
Subject: handle upgrading repositories initialized with --version=9
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~2^2^2~47^2~338
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0d2e3058ee01d55dc3b929ddf8e0573a95a2ca85;p=git-annex.git

handle upgrading repositories initialized with --version=9

There is nothing in upgrade.log because it was never upgraded to version
9. Before, it would have never autoupgraded to 10, but it's entirely
safe to upgrade to 10 immediately.

Of course, annex.autoupgraderepository = false will prevent that
upgrade. So if someone for some reason really wants v9, they can set
that. I can't think of a reason someone would actually want v9 rather
than v10 though.

Sponsored-by: k0ld on Patreon
---

diff --git a/Upgrade/V9.hs b/Upgrade/V9.hs
index 61f256e24c..f2878856a9 100644
--- a/Upgrade/V9.hs
+++ b/Upgrade/V9.hs
@@ -40,12 +40,13 @@ upgrade automatic
 	 - and it is not safe for such to still be running after
 	 - this upgrade. -}
 	oldprocessesdanger = timeOfUpgrade (RepoVersion 9) >>= \case
-		Nothing -> pure True
 		Just t -> do
 			now <- liftIO getPOSIXTime
 			if now < t + 365*24*60*60
 				then return True
 				else assistantrunning
+		-- Initialized at v9, so no old process danger exists.
+		Nothing -> return False
 
 	{- Skip upgrade when git-annex assistant (or watch) is running,
 	 - because these are long-running daemons that could conceivably