[patch] unicode_decode patch

0001-portage-syncmodulesrsync:FixUnicodeDecodeError:bug549826.patch (text/plain), 1.60 KB, created by Brian Dolbec on 2015-05-18 17:10:28 UTC

From b77c8cd13f43860208319083e2f9c996314a6843 Mon Sep 17 00:00:00 2001
From: Brian Dolbec <[e-mail]>
Date: Mon, 18 May 2015 10:04:56 -0700
Subject: [PATCH] portage/sync/modules/rsync: Fix UnicodeDecodeError:  bug
 549826

X-Gentoo-Bug: 549826
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=549826
X-Gentoo-forums: https://forums.gentoo.org/viewtopic-t-1017380.html
---
 pym/portage/sync/modules/rsync/rsync.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py
index d3b0ae3..47ed1de 100644
--- a/pym/portage/sync/modules/rsync/rsync.py
+++ b/pym/portage/sync/modules/rsync/rsync.py
@@ -12,6 +12,7 @@ import tempfile
 
 import portage
 from portage import os
+from portage import _unicode_decode
 from portage.util import writemsg_level
 from portage.output import create_color_func, yellow, blue, bold
 good = create_color_func("GOOD")
@@ -145,7 +146,8 @@ class RsyncSync(NewBase):
 				family, socket.SOCK_STREAM))
 		except socket.error as e:
 			writemsg_level(
-				"!!! getaddrinfo failed for '%s': %s\n" % (hostname, e),
+				"!!! getaddrinfo failed for '%s': %s\n"
+				% (_unicode_decode(hostname), str(e)),
 				noiselevel=-1, level=logging.ERROR)
 
 		if addrinfos:
@@ -197,8 +199,8 @@ class RsyncSync(NewBase):
 			if uris:
 				dosyncuri = uris.pop()
 			else:
-				writemsg("!!! Exhausted addresses for %s\n" % \
-					hostname, noiselevel=-1)
+				writemsg("!!! Exhausted addresses for %s\n"
+					% _unicode_decode(hostname), noiselevel=-1)
 				return (1, False)
 
 			if (retries==0):
-- 
2.4.0