diff options
author | 2011-03-19 18:33:39 -0400 | |
---|---|---|
committer | 2011-03-19 18:33:39 -0400 | |
commit | 6a2a17658c1d508cec022132768e9bc1957098d9 (patch) | |
tree | 0faef3f988c981d35796b6e6f1adfbbbee0e3fa9 /CmdLine.hs | |
parent | 43b3675d4298ffe8cfaefed0d70f0ef1fce25e37 (diff) |
No longer auto-upgrade to repository format 2, to avoid accidental upgrades, etc. Use git-annex upgrade when you're ready to run this version.
Diffstat (limited to 'CmdLine.hs')
-rw-r--r-- | CmdLine.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CmdLine.hs b/CmdLine.hs index 0698f2f5e..6b4fd0f36 100644 --- a/CmdLine.hs +++ b/CmdLine.hs @@ -22,7 +22,7 @@ import qualified GitQueue import Types import Command import BackendList -import Upgrade +import Version import Options import Messages import UUID @@ -33,7 +33,7 @@ dispatch gitrepo args cmds options header = do setupConsole state <- Annex.new gitrepo allBackends (actions, state') <- Annex.run state $ parseCmd args header cmds options - tryRun state' $ [startup, upgrade] ++ actions ++ [shutdown] + tryRun state' $ [startup] ++ actions ++ [shutdown] {- Parses command line, stores configure flags, and returns a - list of actions to be run in the Annex monad. -} @@ -93,6 +93,7 @@ tryRun' _ errnum [] = do startup :: Annex Bool startup = do prepUUID + checkVersion return True {- Cleanup actions. -} |