[Pkg-gnupg-commit] [gnupg2] 225/241: Do not translate messages printed with log_debug.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 218a52787a87be6b7481a39f87d212d6ef594e97
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Dec 3 15:38:25 2015 +0100

    Do not translate messages printed with log_debug.
    
    * common/asshelp.c (start_new_gpg_agent): Do not i18n string.
    (start_new_dirmngr): Ditto.
    * g10/mainproc.c (proc_encrypted): Ditto.  Print only if debug is
    enabled.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 common/asshelp.c | 4 ++--
 g10/mainproc.c   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/common/asshelp.c b/common/asshelp.c
index 4447607..d33ffb5 100644
--- a/common/asshelp.c
+++ b/common/asshelp.c
@@ -498,7 +498,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
     }
 
   if (debug && !did_success_msg)
-    log_debug (_("connection to agent established\n"));
+    log_debug ("connection to agent established\n");
 
   err = assuan_transact (ctx, "RESET",
                          NULL, NULL, NULL, NULL, NULL, NULL);
@@ -694,7 +694,7 @@ start_new_dirmngr (assuan_context_t *r_ctx,
     }
 
   if (debug && !did_success_msg)
-    log_debug (_("connection to the dirmngr established\n"));
+    log_debug ("connection to the dirmngr established\n");
 
   *r_ctx = ctx;
   return 0;
diff --git a/g10/mainproc.c b/g10/mainproc.c
index 3c1508d..8688325 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -646,8 +646,9 @@ proc_encrypted (CTX c, PACKET *pkt)
       if (gpg_err_code (result) == GPG_ERR_BAD_KEY
           && *c->dek->s2k_cacheid != '\0')
         {
-          log_debug (_("cleared passphrase cached with ID: %s\n"),
-                     c->dek->s2k_cacheid);
+          if (opt.debug)
+            log_debug ("cleared passphrase cached with ID: %s\n",
+                       c->dek->s2k_cacheid);
           passphrase_clear_cache (NULL, c->dek->s2k_cacheid, 0);
         }
       glo_ctrl.lasterr = result;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git