From 5377e47d133b1406a2c43da6a0c81eea6a24020d Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 28 Jan 2013 15:13:22 +1100
Subject: assistant: Ignore .DS_Store on OSX.

---
 Assistant/Threads/Watcher.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'Assistant')

diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs
index 9c0439231..6a54ffbff 100644
--- a/Assistant/Threads/Watcher.hs
+++ b/Assistant/Threads/Watcher.hs
@@ -5,7 +5,7 @@
  - Licensed under the GNU GPL version 3 or higher.
  -}
 
-{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE DeriveDataTypeable CPP #-}
 
 module Assistant.Threads.Watcher (
 	watchThread,
@@ -146,6 +146,9 @@ ignored = ig . takeFileName
 	ig ".git" = True
 	ig ".gitignore" = True
 	ig ".gitattributes" = True
+#ifdef darwin_HOST_OS
+	ig ".DS_Store" = True
+#endif
 	ig _ = False
 
 type Handler = FilePath -> Maybe FileStatus -> Assistant (Maybe Change)
-- 
cgit v1.2.3