client/rhel/yum-rhn-plugin/rhnplugin.py | 4 ++--
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 7 ++++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 9 insertions(+), 4 deletions(-)
New commits:
commit b3753abaad072289421c78d88d1aa941db54158f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 30 17:18:41 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.4.8-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index ebd3d33..b4989b3 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.4.7
+Version: 1.4.8
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,11 @@ fi
%doc LICENSE
%changelog
+* Wed Mar 30 2011 Miroslav Suchý 1.4.8-1
+- 683200 - ssl cert can not be unicode string
+- fix variable typo
+- older yum do not have _repos_persistdir
+
* Wed Mar 30 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.7-1
- 683200 - support IDN
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index b5bfbae..4862fbd 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.4.7-1 client/rhel/yum-rhn-plugin/
+1.4.8-1 client/rhel/yum-rhn-plugin/
commit 70357c3b0bf587b40d092ce4ba467c3901321323
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 30 17:15:45 2011 +0200
683200 - ssl cert can not be unicode string
addressing:
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in <module>
yummain.user_main(sys.argv[1:], exit_code=True)
File "/usr/share/yum-cli/yummain.py", line 274, in user_main
errcode = main(args)
File "/usr/share/yum-cli/yummain.py", line 129, in main
result, resultmsgs = base.doCommands()
File "/usr/share/yum-cli/cli.py", line 428, in doCommands
self._getTs(needTsRemove)
File "/usr/lib/python2.6/site-packages/yum/depsolve.py", line 99, in _getTs
self._getTsInfo(remove_only)
File "/usr/lib/python2.6/site-packages/yum/depsolve.py", line 110, in _getTsInfo
pkgSack = self.pkgSack
File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 864, in <lambda>
pkgSack = property(fget=lambda self: self._getSacks(),
File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 650, in _getSacks
self.repos.populateSack(which=repos)
File "/usr/lib/python2.6/site-packages/yum/repos.py", line 289, in populateSack
sack.populate(repo, mdtype, callback, cacheonly)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 164, in populate
if self._check_db_version(repo, mydbtype):
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 222, in _check_db_version
return repo._check_db_version(mdtype)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1255, in _check_db_version
repoXML = self.repoXML
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1454, in <lambda>
repoXML = property(fget=lambda self: self._getRepoXML(),
File "/usr/share/yum-plugins/rhnplugin.py", line 482, in _getRepoXML
return YumRepository._getRepoXML(self)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1446, in _getRepoXML
self._loadRepoXML(text=self)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1436, in _loadRepoXML
return self._groupLoadRepoXML(text, self._mdpolicy2mdtypes())
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1411, in _groupLoadRepoXML
if self._commonLoadRepoXML(text):
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1229, in _commonLoadRepoXML
result = self._getFileRepoXML(local, text)
File "/usr/lib/python2.6/site-packages/yum/yumRepo.py", line 1015, in _getFileRepoXML
size=102400) # setting max size as 100K
File "/usr/share/yum-plugins/rhnplugin.py", line 303, in _getFile
start, end, copy_local, checkfunc, text, reget, cache, size)
File "/usr/share/yum-plugins/rhnplugin.py", line 406, in _noExceptionWrappingGet
size = size
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 985, in urlgrab
return self._retry(opts, retryfunc, url, filename)
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 886, in _retry
r = apply(func, (opts,) + args, {})
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 971, in retryfunc
fo = PyCurlFileObject(url, filename, opts)
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 1066, in __init__
self._do_open()
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 1355, in _do_open
self._set_opts()
File "/usr/lib/python2.6/site-packages/urlgrabber/grabber.py", line 1195, in _set_opts
self.curl_obj.setopt(pycurl.CAPATH, opts.ssl_ca_cert)
TypeError: invalid arguments to setopt
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 48df830..025a909 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -377,7 +377,7 @@ class RhnRepo(YumRepository):
reget = reget,
checkfunc=checkfunc,
http_headers=headers,
- ssl_ca_cert = self.sslcacert,
+ ssl_ca_cert = self.sslcacert.encode('utf-8'),
timeout=self.timeout,
size = size
)
@@ -401,7 +401,7 @@ class RhnRepo(YumRepository):
reget = reget,
checkfunc=checkfunc,
http_headers=headers,
- ssl_ca_cert = self.sslcacert,
+ ssl_ca_cert = self.sslcacert.encode('utf-8'),
timeout=self.timeout,
size = size
)