e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
56 lines
1.4 KiB
Haskell
56 lines
1.4 KiB
Haskell
{- git-annex upgrade support
|
|
-
|
|
- Copyright 2010, 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Upgrade where
|
|
|
|
import Common.Annex
|
|
import Annex.Version
|
|
#ifndef mingw32_HOST_OS
|
|
import qualified Upgrade.V0
|
|
import qualified Upgrade.V1
|
|
#endif
|
|
import qualified Upgrade.V2
|
|
import qualified Upgrade.V3
|
|
import qualified Upgrade.V4
|
|
|
|
checkUpgrade :: Version -> Annex ()
|
|
checkUpgrade = maybe noop error <=< needsUpgrade
|
|
|
|
needsUpgrade :: Version -> Annex (Maybe String)
|
|
needsUpgrade v
|
|
| v == supportedVersion = ok
|
|
| v `elem` autoUpgradeableVersions = ifM (upgrade True)
|
|
( ok
|
|
, err "Automatic upgrade failed!"
|
|
)
|
|
| v `elem` upgradableVersions = err "Upgrade this repository: git-annex upgrade"
|
|
| otherwise = err "Upgrade git-annex."
|
|
where
|
|
err msg = return $ Just $ "Repository version " ++ v ++
|
|
" is not supported. " ++ msg
|
|
ok = return Nothing
|
|
|
|
upgrade :: Bool -> Annex Bool
|
|
upgrade automatic = do
|
|
upgraded <- go =<< getVersion
|
|
when upgraded $
|
|
setVersion supportedVersion
|
|
return upgraded
|
|
where
|
|
#ifndef mingw32_HOST_OS
|
|
go (Just "0") = Upgrade.V0.upgrade
|
|
go (Just "1") = Upgrade.V1.upgrade
|
|
#else
|
|
go (Just "0") = error "upgrade from v0 on Windows not supported"
|
|
go (Just "1") = error "upgrade from v1 on Windows not supported"
|
|
#endif
|
|
go (Just "2") = Upgrade.V2.upgrade
|
|
go (Just "3") = Upgrade.V3.upgrade automatic
|
|
go (Just "4") = Upgrade.V4.upgrade automatic
|
|
go _ = return True
|