| 1 |
X-Gentoo-Bug: 549826 |
| 2 |
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=549826 |
| 3 |
X-Gentoo-forums: https://forums.gentoo.org/viewtopic-t-1017380.html |
| 4 |
--- |
| 5 |
pym/portage/sync/modules/rsync/rsync.py | 8 +++++--- |
| 6 |
1 file changed, 5 insertions(+), 3 deletions(-) |
| 7 |
|
| 8 |
diff --git a/pym/portage/sync/modules/rsync/rsync.py b/pym/portage/sync/modules/rsync/rsync.py |
| 9 |
index d3b0ae3..47ed1de 100644 |
| 10 |
--- a/pym/portage/sync/modules/rsync/rsync.py |
| 11 |
+++ b/pym/portage/sync/modules/rsync/rsync.py |
| 12 |
@@ -12,6 +12,7 @@ import tempfile |
| 13 |
|
| 14 |
import portage |
| 15 |
from portage import os |
| 16 |
+from portage import _unicode_decode |
| 17 |
from portage.util import writemsg_level |
| 18 |
from portage.output import create_color_func, yellow, blue, bold |
| 19 |
good = create_color_func("GOOD") |
| 20 |
@@ -145,7 +146,8 @@ class RsyncSync(NewBase): |
| 21 |
family, socket.SOCK_STREAM)) |
| 22 |
except socket.error as e: |
| 23 |
writemsg_level( |
| 24 |
- "!!! getaddrinfo failed for '%s': %s\n" % (hostname, e), |
| 25 |
+ "!!! getaddrinfo failed for '%s': %s\n" |
| 26 |
+ % (_unicode_decode(hostname), str(e)), |
| 27 |
noiselevel=-1, level=logging.ERROR) |
| 28 |
|
| 29 |
if addrinfos: |
| 30 |
@@ -197,8 +199,8 @@ class RsyncSync(NewBase): |
| 31 |
if uris: |
| 32 |
dosyncuri = uris.pop() |
| 33 |
else: |
| 34 |
- writemsg("!!! Exhausted addresses for %s\n" % \ |
| 35 |
- hostname, noiselevel=-1) |
| 36 |
+ writemsg("!!! Exhausted addresses for %s\n" |
| 37 |
+ % _unicode_decode(hostname), noiselevel=-1) |
| 38 |
return (1, False) |
| 39 |
|
| 40 |
if (retries==0): |
| 41 |
-- |
| 42 |
2.4.0 |
Archives