From df3020fb7e481d6bcf280e05b648861643dd8fb6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 25 Jul 2022 16:01:48 -0400 Subject: [PATCH] avoid writing new line to upgrade.log when upgrade is deferred With automatic upgrades to v10 enabled, this could have led to each run of git-annex adding a line to upgrade.log for v9. However, they're not yet, so it only happened when running git-annex upgrade in a v9 repository. Sponsored-by: Brock Spratlen on Patreon --- Upgrade.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Upgrade.hs b/Upgrade.hs index 6704000f38..01daa3a327 100644 --- a/Upgrade.hs +++ b/Upgrade.hs @@ -67,10 +67,11 @@ needsUpgrade v upgrade :: Bool -> RepoVersion -> Annex Bool upgrade automatic destversion = do - (upgraded, newversion) <- go =<< getVersion - when upgraded $ + startversion <- getVersion + (ok, newversion) <- go startversion + when (ok && newversion /= startversion) $ postupgrade newversion - return upgraded + return ok where go (Just v) | v >= destversion = return (True, Just v)