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

diff --git a/Upgrade/V9.hs b/Upgrade/V9.hs
index 92cc12adf8ac1ae054bc0ee6f2059f95ee7eea1a..86ceb4c3f9e209267de5b4d33596f4f7d97141c2 100644 (file)
--- 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