Revert "handle upgrading repositories initialized with --version=9"
This reverts commit 0d2e3058ee
.
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..
This commit is contained in:
parent
98eb5ff84f
commit
d88f3c6ad8
1 changed files with 1 additions and 2 deletions
|
@ -40,13 +40,12 @@ upgrade automatic
|
||||||
- and it is not safe for such to still be running after
|
- and it is not safe for such to still be running after
|
||||||
- this upgrade. -}
|
- this upgrade. -}
|
||||||
oldprocessesdanger = timeOfUpgrade (RepoVersion 9) >>= \case
|
oldprocessesdanger = timeOfUpgrade (RepoVersion 9) >>= \case
|
||||||
|
Nothing -> pure True
|
||||||
Just t -> do
|
Just t -> do
|
||||||
now <- liftIO getPOSIXTime
|
now <- liftIO getPOSIXTime
|
||||||
if now < t + 365*24*60*60
|
if now < t + 365*24*60*60
|
||||||
then return True
|
then return True
|
||||||
else assistantrunning
|
else assistantrunning
|
||||||
-- Initialized at v9, so no old process danger exists.
|
|
||||||
Nothing -> return False
|
|
||||||
|
|
||||||
{- Skip upgrade when git-annex assistant (or watch) is running,
|
{- Skip upgrade when git-annex assistant (or watch) is running,
|
||||||
- because these are long-running daemons that could conceivably
|
- because these are long-running daemons that could conceivably
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue