summaryrefslogtreecommitdiff
path: root/CmdLine
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:59:27 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-12-26 13:59:27 -0400
commit483abf98b1949b88c3e96c987378be23f8ed869a (patch)
treebc3e75200ea69bf837ccd08a266ca4528efde09b /CmdLine
parent274dbabd972da62e4480bc09fa62bbcdf6f72e6f (diff)
add unlocked flag for git-annex-shell recvkey
The direct flag is also set when sending unlocked content, to support old versions of git-annex-shell. At some point, the direct flag will be removed, and only the unlocked flag will be used.
Diffstat (limited to 'CmdLine')
-rw-r--r--CmdLine/GitAnnexShell.hs1
-rw-r--r--CmdLine/GitAnnexShell/Fields.hs3
2 files changed, 4 insertions, 0 deletions
diff --git a/CmdLine/GitAnnexShell.hs b/CmdLine/GitAnnexShell.hs
index f9678d144..09108f879 100644
--- a/CmdLine/GitAnnexShell.hs
+++ b/CmdLine/GitAnnexShell.hs
@@ -144,6 +144,7 @@ checkField :: (String, String) -> Bool
checkField (field, val)
| field == fieldName remoteUUID = fieldCheck remoteUUID val
| field == fieldName associatedFile = fieldCheck associatedFile val
+ | field == fieldName unlocked = fieldCheck unlocked val
| field == fieldName direct = fieldCheck direct val
| field == fieldName autoInit = fieldCheck autoInit val
| otherwise = False
diff --git a/CmdLine/GitAnnexShell/Fields.hs b/CmdLine/GitAnnexShell/Fields.hs
index bc26df73f..1b76fc766 100644
--- a/CmdLine/GitAnnexShell/Fields.hs
+++ b/CmdLine/GitAnnexShell/Fields.hs
@@ -35,5 +35,8 @@ associatedFile = Field "associatedfile" $ \f ->
direct :: Field
direct = Field "direct" $ \f -> f == "1"
+unlocked :: Field
+unlocked = Field "unlocked" $ \f -> f == "1"
+
autoInit :: Field
autoInit = Field "autoinit" $ \f -> f == "1"