From d88f3c6ad83fa63a6b65ef720dc59a68172d6302 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Sep 2022 12:17:50 -0400 Subject: [PATCH] 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.. --- Upgrade/V9.hs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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