diff options
| -rw-r--r-- | Crypto.hs | 3 | ||||
| -rw-r--r-- | GitAnnex.hs | 11 | ||||
| -rw-r--r-- | Limit.hs | 3 |
3 files changed, 11 insertions, 6 deletions
@@ -95,7 +95,8 @@ describeCipher (EncryptedCipher _ (KeyIds ks)) = {- Encrypts a Cipher to the specified KeyIds. -} encryptCipher :: Cipher -> KeyIds -> IO StorableCipher encryptCipher (Cipher c) (KeyIds ks) = do - let ks' = nub $ sort ks -- gpg complains about duplicate recipient keyids + -- gpg complains about duplicate recipient keyids + let ks' = nub $ sort ks encipher <- Gpg.pipeStrict ([ Params "--encrypt" ] ++ recipients ks') c return $ EncryptedCipher encipher (KeyIds ks') where diff --git a/GitAnnex.hs b/GitAnnex.hs index 0b4a7f8d9..78b374358 100644 --- a/GitAnnex.hs +++ b/GitAnnex.hs @@ -147,11 +147,11 @@ options :: [Option] options = Option.common ++ [ Option ['N'] ["numcopies"] (ReqArg setnumcopies paramNumber) "override default number of copies" - , Option [] ["trust"] (ReqArg (Remote.forceTrust Trusted) paramRemote) + , Option [] ["trust"] (trustArg Trusted) "override trust setting" - , Option [] ["semitrust"] (ReqArg (Remote.forceTrust SemiTrusted) paramRemote) + , Option [] ["semitrust"] (trustArg SemiTrusted) "override trust setting back to default" - , Option [] ["untrust"] (ReqArg (Remote.forceTrust UnTrusted) paramRemote) + , Option [] ["untrust"] (trustArg UnTrusted) "override trust setting to untrusted" , Option ['c'] ["config"] (ReqArg setgitconfig "NAME=VALUE") "override git configuration setting" @@ -173,7 +173,8 @@ options = Option.common ++ "skip files smaller than a size" , Option ['T'] ["time-limit"] (ReqArg Limit.addTimeLimit paramTime) "stop after the specified amount of time" - , Option [] ["trust-glacier"] (NoArg (Annex.setFlag "trustglacier")) "Trust Amazon Glacier inventory" + , Option [] ["trust-glacier"] (NoArg (Annex.setFlag "trustglacier")) + "Trust Amazon Glacier inventory" ] ++ Option.matcher where setnumcopies v = maybe noop @@ -181,6 +182,8 @@ options = Option.common ++ (readish v) setgitconfig v = Annex.changeGitRepo =<< inRepo (Git.Config.store v) + trustArg t = ReqArg (Remote.forceTrust t) paramRemote + header :: String header = "Usage: git-annex command [option ..]" @@ -51,7 +51,8 @@ getMatcher' = do Right r -> return r Left l -> do let matcher = Utility.Matcher.generate (reverse l) - Annex.changeState $ \s -> s { Annex.limit = Right matcher } + Annex.changeState $ \s -> + s { Annex.limit = Right matcher } return matcher {- Adds something to the limit list, which is built up reversed. -} |