diff options
author | Joey Hess <joeyh@joeyh.name> | 2017-12-05 14:25:51 -0400 |
---|---|---|
committer | Joey Hess <joeyh@joeyh.name> | 2017-12-05 14:25:51 -0400 |
commit | 5c381e9b2c5d8048f597b3302b417add5e2309bd (patch) | |
tree | 8bf0fdf6a2bf27fd10298ef90a30bd29cb1e3d1b | |
parent | e6a9043dfe2ca5b82081f056cdfff4ed5fdfec93 (diff) |
try again to avoid directory removal issues on NFS
6c4c1a9bccfaa94525f343153b179c2170293686 seems to not have worked;
though the keys database should not have any files open after closeDb,
NFS seems to be creating some files where while the directory is being
removed, which causes the removal to fail.
So instead, try renaming the directory out of the way.
This commit was supported by the NSF-funded DataLad project.
-rw-r--r-- | Test.hs | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -675,7 +675,7 @@ test_lock_v6_force = intmpclonerepoInDirect $ do annexeval $ do Database.Keys.closeDb dbdir <- Annex.fromRepo Annex.Locations.gitAnnexKeysDb - liftIO $ removeDirectoryRecursive dbdir + liftIO $ renameDirectory dbdir (dbdir ++ ".old") writeFile annexedfile "test_lock_v6_force content" not <$> git_annex "lock" [annexedfile] @? "lock of modified file failed to fail in v6 mode" git_annex "lock" ["--force", annexedfile] @? "lock --force of modified file failed in v6 mode" |