diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-29 13:06:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-29 13:06:23 -0400 |
| commit | a696b98024d8b9009cd6ad021f20e087607145f6 (patch) | |
| tree | 8e548dda8421a1d698ebba4ed90429011ab47642 /Upgrade | |
| parent | 9e53aca36b2b709034dc3ff57827a964e4a8a3d8 (diff) | |
Auto-upgrade v3 indirect repos to v5 with no changes. This also fixes a problem when a direct mode repo was somehow set to v3 rather than v4, and so the automatic direct mode upgrade to v5 was not done.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V1.hs | 4 | ||||
| -rw-r--r-- | Upgrade/V4.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Upgrade/V1.hs b/Upgrade/V1.hs index 688f4c571..8af4848a1 100644 --- a/Upgrade/V1.hs +++ b/Upgrade/V1.hs @@ -53,14 +53,14 @@ upgrade = do ifM (fromRepo Git.repoIsLocalBare) ( do moveContent - setVersion defaultVersion + setVersion supportedVersion , do moveContent updateSymlinks moveLocationLogs Annex.Queue.flush - setVersion defaultVersion + setVersion supportedVersion ) Upgrade.V2.upgrade diff --git a/Upgrade/V4.hs b/Upgrade/V4.hs index 147ace559..dad073d0b 100644 --- a/Upgrade/V4.hs +++ b/Upgrade/V4.hs @@ -11,7 +11,7 @@ import Common.Annex import Config import Annex.Direct -{- Direct mode only upgrade. -} +{- Direct mode only upgrade. v4 to v5 indirect update is a no-op -} upgrade :: Bool -> Annex Bool upgrade automatic = ifM isDirect ( do @@ -19,5 +19,5 @@ upgrade automatic = ifM isDirect showAction "v4 to v5" setDirect True return True - , return False + , return True ) |