From b8f85f7a82009f3480abaedae510b4db1c3b3f3a Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 6 Jun 2012 22:49:32 -0400 Subject: [PATCH] build watch on non-linux, just don't do anything --- Command/Watch.hs | 11 ++++++++++- Utility/Inotify.hs | 2 -- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Command/Watch.hs b/Command/Watch.hs index dcd411d43a..4786311002 100644 --- a/Command/Watch.hs +++ b/Command/Watch.hs @@ -5,6 +5,7 @@ - Licensed under the GNU GPL version 3 or higher. -} +{-# LANGUAGE CPP #-} {-# LANGUAGE BangPatterns #-} module Command.Watch where @@ -25,9 +26,12 @@ import qualified Backend import Annex.Content import Control.Exception as E -import System.INotify import Control.Concurrent.MVar +#if defined linux_HOST_OS +import System.INotify +#endif + def :: [Command] def = [command "watch" paramPaths seek "watch for changes"] @@ -35,6 +39,7 @@ seek :: [CommandSeek] seek = [withNothing start] start :: CommandStart +#if defined linux_HOST_OS start = notBareRepo $ do showStart "watch" "." showAction "scanning" @@ -56,6 +61,10 @@ start = notBareRepo $ do ignored ".gitattributes" = True ignored _ = False +#else +start = error "watch mode is so far only available on Linux" +#endif + {- Runs a handler, inside the Annex monad. - - Exceptions by the handlers are ignored, otherwise a whole watcher diff --git a/Utility/Inotify.hs b/Utility/Inotify.hs index b74fbd18d5..8504b21d03 100644 --- a/Utility/Inotify.hs +++ b/Utility/Inotify.hs @@ -5,8 +5,6 @@ - Licensed under the GNU GPL version 3 or higher. -} -{-# LANGUAGE CPP #-} - module Utility.Inotify where import Common hiding (isDirectory)