From 9050788b66fc68af77f21a7a564e8688c4465445 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 26 Feb 2020 15:02:23 -0400 Subject: [PATCH] info: Fix display of the encryption value. (Some debugging junk had crept in.) --- CHANGELOG | 2 ++ Remote/Helper/Encryptable.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 443bdbeaba..c1fa9f78c4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -36,6 +36,8 @@ git-annex (8.20200221) UNRELEASED; urgency=medium of an IP address to be used, while denying use of other ports. * Bugfix to getting content from an export remote with -J, when the export database was not yet populated. + * info: Fix display of the encryption value. + (Some debugging junk had crept in.) -- Joey Hess Wed, 19 Feb 2020 12:48:58 -0400 diff --git a/Remote/Helper/Encryptable.hs b/Remote/Helper/Encryptable.hs index 33ef848bb7..e4ae10b352 100644 --- a/Remote/Helper/Encryptable.hs +++ b/Remote/Helper/Encryptable.hs @@ -284,7 +284,7 @@ isEncrypted = isJust . extractCipher describeEncryption :: ParsedRemoteConfig -> String describeEncryption c = case extractCipher c of - Nothing -> "none" ++ show (getRemoteConfigValue cipherField c :: Maybe String) ++ show (M.keys c) + Nothing -> "none" Just cip -> nameCipher cip ++ " (" ++ describeCipher cip ++ ")" nameCipher :: StorableCipher -> String