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 /Command | |
| 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 'Command')
| -rw-r--r-- | Command/Fsck.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Command/Fsck.hs b/Command/Fsck.hs index d3a8b3083..2ab47b562 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -38,7 +38,7 @@ import GitAnnex.Options hiding (fromOption) #ifndef mingw32_HOST_OS import System.Posix.Process (getProcessID) #else -import System.Random (getStdRandom, random) +import System.Win32.Process.Current (getCurrentProcessId) #endif import Data.Time.Clock.POSIX import Data.Time @@ -154,7 +154,7 @@ performRemote key file backend numcopies remote = #ifndef mingw32_HOST_OS v <- liftIO getProcessID #else - v <- liftIO (getStdRandom random :: IO Int) + v <- liftIO getCurrentProcessId #endif t <- fromRepo gitAnnexTmpDir createAnnexDirectory t |