mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more lock file refactoring

Browse source
This commit is contained in:
Joey Hess 2014-08-20 17:03:04 -04:00
parent d279180266
commit ec7dd0446a
3 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Logs/Transfer.hs
View file

@ -17,9 +17,7 @@ import Utility.Metered
import Utility.Percentage
import Utility.QuickCheck
import Utility.PID
#ifdef mingw32_HOST_OS
import Utility.WinLock
#endif
import Utility.LockFile
import Data.Time.Clock
import Data.Time.Clock.POSIX
@ -131,9 +129,7 @@ checkTransfer :: Transfer -> Annex (Maybe TransferInfo)
checkTransfer t = do
tfile <- fromRepo $ transferFile t
#ifndef mingw32_HOST_OS
mode <- annexFileMode
mfd <- liftIO $ catchMaybeIO $
openFd (transferLockFile tfile) ReadOnly (Just mode) defaultFileFlags
mfd <- liftIO $ openExistingLockFile (transferLockFile tfile)
case mfd of
Nothing -> return Nothing -- failed to open file; not running
Just fd -> do