summaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-01-28 15:13:22 +1100
committerGravatar Joey Hess <joey@kitenet.net>2013-01-28 15:13:22 +1100
commit5377e47d133b1406a2c43da6a0c81eea6a24020d (patch)
treeff55d09448b41dc68b00ba29fd9898aeb55da9d4 /Assistant
parentfdfd8790fd4471392fb6b843ed813e10eb61e8fc (diff)
assistant: Ignore .DS_Store on OSX.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/Watcher.hs5
1 files changed, 4 insertions, 1 deletions
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)