client/rhel/rhn-client-tools/rhn-client-tools.spec | 8 +++++++-
client/rhel/rhn-client-tools/src/up2date_client/config.py | 2 +-
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
New commits:
commit bd91a9e57025185f04130540b01e45426a198631
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 17:59:41 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.5.8-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index c881ced..2da946f 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL:
https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.5.7
+Version: 1.5.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -341,6 +341,12 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon May 23 2011 Miroslav Suchý 1.5.8-1
+- 683200 - u'foo'.decode('utf-8') does not work, while
unicode(u'foo') works
+ and is idempotent (msuchy(a)redhat.com)
+- 683200 - if I want url in unicode, I must us decode - remember that
+ (msuchy(a)redhat.com)
+
* Thu Apr 28 2011 Simon Lukasik <slukasik(a)redhat.com> 1.5.7-1
- The Debian client on x86_64 should send amd64-debian-linux
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index eab29fd..a5889a3 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.5.7-1 client/rhel/rhn-client-tools/
+1.5.8-1 client/rhel/rhn-client-tools/
commit 1e04949035cac72489ed757017418cb990fb2110
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 17:03:53 2011 +0200
683200 - u'foo'.decode('utf-8') does not work, while
unicode(u'foo') works and is idempotent
addressing:
Traceback (most recent call last):
File "/usr/sbin/rhn_register", line 76, in ?
app.run()
File "/usr/share/rhn/up2date_client/rhncli.py", line 74, in run
sys.exit(self.main() or 0)
File "/usr/sbin/rhn_register", line 58, in main
ui.main()
File "/usr/share/rhn/up2date_client/tui.py", line 1263, in main
tui.run()
File "/usr/share/rhn/up2date_client/tui.py", line 1211, in run
win = self.windows[index](self.screen, self)
File "/usr/share/rhn/up2date_client/tui.py", line 126, in __init__
(SYSTEM_ALREADY_REGISTERED + "\n\n"
File "/usr/share/rhn/up2date_client/config.py", line 299, in
convert_url_from_pune
return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3],
s[4])).decode('utf-8')
File "/usr/lib/python2.4/encodings/utf_8.py", line 16, in decode
return codecs.utf_8_decode(input, errors, True)
exceptions.UnicodeEncodeError: 'ascii' codec can't encode character
u'\u017e' in position 8: ordinal not in range(128)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py
b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 7bbd239..f51e8e5 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -296,7 +296,7 @@ def convert_url_to_pune(url):
def convert_url_from_pune(url):
""" returns url where hostname is converted from Pune encoding.
Returns unicode string. """
s = urlsplit(url)
- return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3],
s[4])).decode('utf-8')
+ return unicode(urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3], s[4])))
def getServerlURL():
""" return list of serverURL from config
commit 9f25ce2ddd44b068b5f3e464fcfdc97f3d83f957
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon May 23 16:55:59 2011 +0200
683200 - if I want url in unicode, I must us decode - remember that
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/config.py
b/client/rhel/rhn-client-tools/src/up2date_client/config.py
index 8efe530..7bbd239 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/config.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/config.py
@@ -296,7 +296,7 @@ def convert_url_to_pune(url):
def convert_url_from_pune(url):
""" returns url where hostname is converted from Pune encoding.
Returns unicode string. """
s = urlsplit(url)
- return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3],
s[4])).encode('utf-8')
+ return urlunsplit((s[0], idn_pune_to_unicode(s[1]), s[2], s[3],
s[4])).decode('utf-8')
def getServerlURL():
""" return list of serverURL from config