diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-11 00:15:10 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-11 00:15:10 -0400 |
| commit | ceb2a55aad9667421e8bb74f263786c74e6798fd (patch) | |
| tree | b20eb544958829d068930317b09bdedee57c110a /Remote | |
| parent | ab0dd8edd4c5ab74ee90d41e920b9e0425afdf89 (diff) | |
pull in Win32-extras, to be able to get current process id in Windows
Fixed up a number of things that had worked around there not being a way to
get that.
Most notably, transfer info files on windows now include the process id,
since no locking is currently done. This means the file format varies
between windows and unix.
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Rsync.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 627690d2b..fd00d4674 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -23,7 +23,7 @@ import qualified Data.Map as M #ifndef mingw32_HOST_OS import System.Posix.Process (getProcessID) #else -import System.Random (getStdRandom, random) +import System.Win32.Process.Current (getCurrentProcessId) #endif import Common.Annex @@ -243,7 +243,7 @@ withRsyncScratchDir a = do #ifndef mingw32_HOST_OS v <- liftIO getProcessID #else - v <- liftIO (getStdRandom random :: IO Int) + v <- liftIO getCurrentProcessId #endif t <- fromRepo gitAnnexTmpDir createAnnexDirectory t |