summaryrefslogtreecommitdiff
path: root/Upgrade
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-09 15:42:16 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-09 15:52:11 -0400
commitb5c8ba7db3ea2eb4f1cd28e49cadb5fd348ca738 (patch)
tree81d2f8bca341e56bb20d01d68e0a60812e285aa2 /Upgrade
parent7f00b7eaf0877e791194e7dfed5abefbb091ee86 (diff)
move InodeSentinal from direct mode code to its own module
Will be used outside of direct mode for v6 unlocked files, and is already used outside of direct mode when adding files to annex.
Diffstat (limited to 'Upgrade')
-rw-r--r--Upgrade/V5.hs7
1 files changed, 7 insertions, 0 deletions
diff --git a/Upgrade/V5.hs b/Upgrade/V5.hs
index cf273bb16..e4501302d 100644
--- a/Upgrade/V5.hs
+++ b/Upgrade/V5.hs
@@ -9,10 +9,17 @@ module Upgrade.V5 where
import Common.Annex
import Config
+import Annex.InodeSentinal
upgrade :: Bool -> Annex Bool
upgrade automatic = do
unless automatic $
showAction "v5 to v6"
configureSmudgeFilter
+ -- Inode sentinal file was only used in direct mode and when
+ -- locking down files as they were added. In v6, it's used more
+ -- extensively, so make sure it exists, since old repos that didn't
+ -- use direct mode may not have created it.
+ unlessM (isDirect) $
+ createInodeSentinalFile True
return True