[Reproducible-commits] [debbindiff] 02/03: Error out when encoding is not Unicode-compatible for text output

Jérémy Bobbio lunar at moszumanska.debian.org
Mon Mar 23 21:08:13 UTC 2015


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

lunar pushed a commit to branch master
in repository debbindiff.

commit cb94538fcf483261bc23c3943006f033cab89db6
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Mon Mar 23 21:58:22 2015 +0100

    Error out when encoding is not Unicode-compatible for text output
---
 debbindiff/presenters/text.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/debbindiff/presenters/text.py b/debbindiff/presenters/text.py
index dadd218..5cda5ce 100644
--- a/debbindiff/presenters/text.py
+++ b/debbindiff/presenters/text.py
@@ -22,6 +22,7 @@
 import sys
 import difflib
 import locale
+from debbindiff import logger
 
 
 def print_difference(difference, print_func):
@@ -60,8 +61,12 @@ def print_details(difference, print_func):
     print_func(u'╵')
 
 def output_text(differences, print_func):
-    for difference in differences:
-        print_func("--- %s" % (difference.source1))
-        print_func("+++ %s" % (difference.source2))
-        print_difference(difference, print_func)
-        print_details(difference, print_func)
+    try:
+        for difference in differences:
+            print_func("--- %s" % (difference.source1))
+            print_func("+++ %s" % (difference.source2))
+            print_difference(difference, print_func)
+            print_details(difference, print_func)
+    except UnicodeEncodeError:
+        logger.critical('Console is unable to print Unicode characters. Set LC_CTYPE=C.UTF-8')
+        sys.exit(2)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/debbindiff.git



More information about the Reproducible-commits mailing list