summaryrefslogtreecommitdiff
path: root/Command
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-12-31 15:46:33 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-12-31 15:46:33 -0400
commiteac433a84ad397e371300343b7cd30b7741ee023 (patch)
treeb3e02fa4f6942657f622c4790d9fb4d2d2a17e95 /Command
parent60df4e5728b8af804f06c39ef3b897af12247ceb (diff)
use git-annex-shell configlist
Diffstat (limited to 'Command')
-rw-r--r--Command/Move.hs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Command/Move.hs b/Command/Move.hs
index e872d86fe..4291d221a 100644
--- a/Command/Move.hs
+++ b/Command/Move.hs
@@ -7,6 +7,7 @@
module Command.Move where
+import Control.Monad (when)
import Control.Monad.State (liftIO)
import Command
@@ -20,6 +21,7 @@ import qualified GitRepo as Git
import qualified Remotes
import UUID
import Messages
+import Utility
command :: [Command]
command = [Command "move" paramPath seek
@@ -134,10 +136,11 @@ fromPerform move key = do
else return Nothing -- fail
fromCleanup :: Bool -> Git.Repo -> Key -> CommandCleanup
fromCleanup True remote key = do
- ok <- Remotes.onRemote remote "dropkey"
+ ok <- Remotes.onRemote remote boolSystem False "dropkey"
["--quiet", "--force",
"--backend=" ++ backendName key,
keyName key]
- remoteHasKey remote key False
+ when ok $
+ remoteHasKey remote key False
return ok
fromCleanup False _ _ = return True