summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-04-22 16:41:46 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-04-22 16:41:46 -0400
commit3cf16ebe5ea70e79bc4e45214265009ef7b975d0 (patch)
treed751054a064714d10ae70d75688fa1a1b3e9483f /Command
parentafec3a563930bb402b66d4c3c4c4c9c0572b1aa1 (diff)
direct, indirect: Refuse to do anything when the assistant or git-annex watch daemon is running.
Diffstat (limited to 'Command')
-rw-r--r--Command/Direct.hs2
-rw-r--r--Command/Indirect.hs5
2 files changed, 4 insertions, 3 deletions
diff --git a/Command/Direct.hs b/Command/Direct.hs
index 7ded712ae..7835988b4 100644
--- a/Command/Direct.hs
+++ b/Command/Direct.hs
@@ -17,7 +17,7 @@ import Annex.Direct
import Annex.Version
def :: [Command]
-def = [notBareRepo $
+def = [notBareRepo $ noDaemonRunning $
command "direct" paramNothing seek
SectionSetup "switch repository to direct mode"]
diff --git a/Command/Indirect.hs b/Command/Indirect.hs
index 9ce2751be..59972a66b 100644
--- a/Command/Indirect.hs
+++ b/Command/Indirect.hs
@@ -21,8 +21,9 @@ import Annex.Version
import Init
def :: [Command]
-def = [notBareRepo $ command "indirect" paramNothing seek
- SectionSetup "switch repository to indirect mode"]
+def = [notBareRepo $ noDaemonRunning $
+ command "indirect" paramNothing seek
+ SectionSetup "switch repository to indirect mode"]
seek :: [CommandSeek]
seek = [withNothing start]