diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-02-15 14:16:48 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-02-15 14:16:48 -0400 |
| commit | bd0c83bf21d6ebd646576e60bedd0444b33468c7 (patch) | |
| tree | e5abcbf96b8180b16f25e166786db2208e9163df /CmdLine/GitAnnexShell.hs | |
| parent | 3776ebfd3f94a46df0878a9cc506ed0e3ff2cbd2 (diff) | |
| parent | 7644cfac07de00f1d298b01d1a9d62fc9587f295 (diff) | |
Merge branch 'master' into database
Diffstat (limited to 'CmdLine/GitAnnexShell.hs')
| -rw-r--r-- | CmdLine/GitAnnexShell.hs | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs index f490792b0..b1b351e3b 100644 --- a/CmdLine/GitAnnexShell.hs +++ b/CmdLine/GitAnnexShell.hs @@ -1,6 +1,6 @@ {- git-annex-shell main program - - - Copyright 2010-2012 Joey Hess <joey@kitenet.net> + - Copyright 2010-2012 Joey Hess <id@joeyh.name> - - Licensed under the GNU GPL version 3 or higher. -} @@ -29,22 +29,24 @@ import qualified Command.RecvKey import qualified Command.SendKey import qualified Command.TransferInfo import qualified Command.Commit +import qualified Command.NotifyChanges import qualified Command.GCryptSetup cmds_readonly :: [Command] cmds_readonly = concat - [ gitAnnexShellCheck Command.ConfigList.def - , gitAnnexShellCheck Command.InAnnex.def - , gitAnnexShellCheck Command.SendKey.def - , gitAnnexShellCheck Command.TransferInfo.def + [ gitAnnexShellCheck Command.ConfigList.cmd + , gitAnnexShellCheck Command.InAnnex.cmd + , gitAnnexShellCheck Command.SendKey.cmd + , gitAnnexShellCheck Command.TransferInfo.cmd + , gitAnnexShellCheck Command.NotifyChanges.cmd ] cmds_notreadonly :: [Command] cmds_notreadonly = concat - [ gitAnnexShellCheck Command.RecvKey.def - , gitAnnexShellCheck Command.DropKey.def - , gitAnnexShellCheck Command.Commit.def - , Command.GCryptSetup.def + [ gitAnnexShellCheck Command.RecvKey.cmd + , gitAnnexShellCheck Command.DropKey.cmd + , gitAnnexShellCheck Command.Commit.cmd + , Command.GCryptSetup.cmd ] cmds :: [Command] @@ -64,7 +66,7 @@ options = commonOptions ++ check u = unexpectedUUID expected u checkGCryptUUID expected = check =<< getGCryptUUID True =<< gitRepo where - check (Just u) | u == toUUID expected = noop + check (Just u) | u == toUUID expected = noop check Nothing = unexpected expected "uninitialized repository" check (Just u) = unexpectedUUID expected u unexpectedUUID expected u = unexpected expected $ "UUID " ++ fromUUID u |