diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-10-22 17:14:38 -0400 |
| commit | 33e7dd2e0b756270cb51d1ed574cbe4b8173c7cd (patch) | |
| tree | 0e9ff04c04c33cd1ba45171983d1b9f4d92cac60 /Utility/Daemon.hs | |
| parent | 2d7b57270e628994483495159d2be715c8f9531b (diff) | |
| parent | 49475bb89542e92c6f466425f29cd0640a8e80f4 (diff) | |
Merge branch 'master' into s3-aws
Conflicts:
Remote/S3.hs
Diffstat (limited to 'Utility/Daemon.hs')
| -rw-r--r-- | Utility/Daemon.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utility/Daemon.hs b/Utility/Daemon.hs index 2f0f84179..0615149e5 100644 --- a/Utility/Daemon.hs +++ b/Utility/Daemon.hs @@ -175,7 +175,7 @@ winLockFile pid pidfile = do cleanstale return $ prefix ++ show pid ++ suffix where - prefix = pidfile ++ "." + prefix = pidfile ++ "." suffix = ".lck" cleanstale = mapM_ (void . tryIO . removeFile) =<< (filter iswinlockfile <$> dirContents (parentDir pidfile)) |