summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Annex/Init.hs4
-rw-r--r--debian/changelog2
2 files changed, 6 insertions, 0 deletions
diff --git a/Annex/Init.hs b/Annex/Init.hs
index 3f27a1172..50f4d8522 100644
--- a/Annex/Init.hs
+++ b/Annex/Init.hs
@@ -162,13 +162,17 @@ probeFifoSupport = do
#else
tmp <- fromRepo gitAnnexTmpMiscDir
let f = tmp </> "gaprobe"
+ let f2 = tmp </> "gaprobe2"
createAnnexDirectory tmp
liftIO $ do
nukeFile f
+ nukeFile f2
ms <- tryIO $ do
createNamedPipe f ownerReadMode
+ createLink f f2
getFileStatus f
nukeFile f
+ nukeFile f2
return $ either (const False) isNamedPipe ms
#endif
diff --git a/debian/changelog b/debian/changelog
index adddf91aa..5fde8b216 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ git-annex (5.20150328) UNRELEASED; urgency=medium
* Significantly sped up processing of large numbers of directories
passed to a single git-annex command.
* version: Add --raw
+ * init: Improve fifo test to detect NFS systems that support fifos
+ but not well enough for sshcaching.
-- Joey Hess <id@joeyh.name> Fri, 27 Mar 2015 16:04:43 -0400