From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 20 Mar 2013 20:41:00 +0000 (-0700)
Subject: Merge remote-tracking branch 'mikegabriel/proposal_upstream' into mike_patches
X-Git-Tag: release/2.6.0~280^2~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=45c0f862895dfe537b2ed6e55cca35b4565abe63;hp=de4869db73405466eec3f35456231ee051b1cb3d;p=debbugs.git

Merge remote-tracking branch 'mikegabriel/proposal_upstream' into mike_patches
---

diff --git a/Debbugs/UTF8.pm b/Debbugs/UTF8.pm
index 45da58f..7ab8f9c 100644
--- a/Debbugs/UTF8.pm
+++ b/Debbugs/UTF8.pm
@@ -178,7 +178,7 @@ sub convert_to_utf8 {
     if (not defined $retval or
         $retval < 0
        ) {
-        warn "failed to convert to utf8";
+        warn "failed to convert to utf8 (charset: $charset, data: $data)";
         # Fallback to encode, which will probably also fail.
         return __fallback_convert_to_utf8($data,$charset);
     }