diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-09-07 13:06:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-09-07 13:06:36 -0400 |
| commit | a6ec0903618c6d82c7e5579cd52f24570923af0a (patch) | |
| tree | 8ee14affea6ea3c92b7a26e16468ef5aa9b4b336 | |
| parent | d56a0f01712c393b499bb12031700e1c8bd78b48 (diff) | |
gpg: Force --no-textmode in case the user has it turned on in config.
| -rw-r--r-- | Utility/Gpg.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/GPG_can__39__t_handle_some_files.mdwn | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/Utility/Gpg.hs b/Utility/Gpg.hs index faf6889a3..c45b27276 100644 --- a/Utility/Gpg.hs +++ b/Utility/Gpg.hs @@ -59,7 +59,11 @@ stdParams params = do {- Usual options for symmetric / public-key encryption. -} stdEncryptionParams :: Bool -> [CommandParam] -stdEncryptionParams symmetric = [enc symmetric, Param "--force-mdc"] +stdEncryptionParams symmetric = + [ enc symmetric + , Param "--force-mdc" + , Param "--no-textmode" + ] where enc True = Param "--symmetric" -- Force gpg to only encrypt to the specified recipients, not diff --git a/debian/changelog b/debian/changelog index 0c001d33a..69181dfdc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,7 @@ git-annex (4.20130828) UNRELEASED; urgency=low * Fix Feeds display in build flags. * Remind user when annex-ignore is set for some remotes, if unable to get or drop a file, possibly because it's on an ignored remote. + * gpg: Force --no-textmode in case the user has it turned on in config. -- Joey Hess <joeyh@debian.org> Tue, 27 Aug 2013 11:03:00 -0400 diff --git a/doc/bugs/GPG_can__39__t_handle_some_files.mdwn b/doc/bugs/GPG_can__39__t_handle_some_files.mdwn index 5ae03b0ec..6c29a95b8 100644 --- a/doc/bugs/GPG_can__39__t_handle_some_files.mdwn +++ b/doc/bugs/GPG_can__39__t_handle_some_files.mdwn @@ -19,3 +19,5 @@ A workaround is to remove "textmode" from your gpg.conf, but git-annex should fo 7ae625363bcb6e1fc8b3733c1d7814aca05a2368 on Ubuntu 13.04 x86_64 +> The sheer number of ways gpg offers of shooting yourself in the foot.. +> Ok [[done]] --[[Joey]] |