From: Joey Hess <joeyh@joeyh.name>
Date: Mon, 26 Sep 2022 16:17:50 +0000 (-0400)
Subject: Revert "handle upgrading repositories initialized with --version=9"
X-Git-Tag: archive/raspbian/10.20250416-2+rpi1~1^2~69^2~50
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d88f3c6ad83fa63a6b65ef720dc59a68172d6302;p=git-annex.git

Revert "handle upgrading repositories initialized with --version=9"

This reverts commit 0d2e3058ee01d55dc3b929ddf8e0573a95a2ca85.

This commit accidentially caused repos that were initialized at v8 to
also upgrade to v10. There is nothing in the upgrade.log for such a
repo..
---

diff --git a/Upgrade/V9.hs b/Upgrade/V9.hs
index 951feb9ab4..124e285498 100644
--- a/Upgrade/V9.hs
+++ b/Upgrade/V9.hs
@@ -40,13 +40,12 @@ 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