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.
This commit is contained in:
parent
7f6685c16e
commit
b1d7474c1d
9 changed files with 18 additions and 29 deletions
|
@ -16,7 +16,6 @@ import qualified Git.Command
|
|||
import qualified Git.LsFiles
|
||||
import Config
|
||||
import Annex.Direct
|
||||
import Annex.Version
|
||||
import Annex.Exception
|
||||
|
||||
def :: [Command]
|
||||
|
@ -69,5 +68,4 @@ cleanup :: CommandCleanup
|
|||
cleanup = do
|
||||
showStart "direct" ""
|
||||
setDirect True
|
||||
setVersion directModeVersion
|
||||
return True
|
||||
|
|
|
@ -22,7 +22,6 @@ import Annex.Direct
|
|||
import Annex.Content
|
||||
import Annex.Content.Direct
|
||||
import Annex.CatFile
|
||||
import Annex.Version
|
||||
import Annex.Exception
|
||||
import Init
|
||||
import qualified Command.Add
|
||||
|
@ -107,7 +106,6 @@ perform = do
|
|||
|
||||
cleanup :: CommandCleanup
|
||||
cleanup = do
|
||||
setVersion defaultVersion
|
||||
showStart "indirect" ""
|
||||
showEndOk
|
||||
return True
|
||||
|
|
|
@ -30,9 +30,7 @@ start = do
|
|||
liftIO $ do
|
||||
showPackageVersion
|
||||
info "local repository version" $ fromMaybe "unknown" v
|
||||
info "default repository version" defaultVersion
|
||||
info "supported repository versions" $
|
||||
unwords supportedVersions
|
||||
info "supported repository version" supportedVersion
|
||||
info "upgrade supported from repository versions" $
|
||||
unwords upgradableVersions
|
||||
stop
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue