client/rhel/yum-rhn-plugin/rhnplugin.py | 3 ++-
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit 19236bef7eb382a34b80b5b3b6842eb1926e861a
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 21 10:45:31 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.5.4-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index d8c69b3..728f54d 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.5.3
+Version: 1.5.4
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,9 @@ fi
%doc LICENSE
%changelog
+* Thu Apr 21 2011 Miroslav Suchý 1.5.4-1
+- in rhel5 http_header is not present
+
* Wed Apr 20 2011 Miroslav Suchý 1.5.3-1
- rhel5 does not have _default_grabopts()
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index d1b2396..12ab28d 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.5.3-1 client/rhel/yum-rhn-plugin/
+1.5.4-1 client/rhel/yum-rhn-plugin/
commit 46c7d9b2729bbdce5b5f9ba505a4be2e7d79b1c2
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Apr 21 10:43:56 2011 +0200
in rhel5 http_header is not present
addressing:
Traceback (most recent call last):
File "/usr/bin/yum", line 29, in ?
yummain.user_main(sys.argv[1:], exit_code=True)
File "/usr/share/yum-cli/yummain.py", line 309, in user_main
errcode = main(args)
File "/usr/share/yum-cli/yummain.py", line 178, in main
result, resultmsgs = base.doCommands()
File "/usr/share/yum-cli/cli.py", line 349, in doCommands
return self.yum_cli_commands[self.basecmd].doCommand(self, self.basecmd,
self.extcmds)
File "/usr/share/yum-cli/yumcommands.py", line 781, in doCommand
base.repos.populateSack()
File "/usr/lib/python2.4/site-packages/yum/repos.py", line 260, in
populateSack
sack.populate(repo, mdtype, callback, cacheonly)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 168, in
populate
if self._check_db_version(repo, mydbtype):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 226, in
_check_db_version
return repo._check_db_version(mdtype)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1233, in
_check_db_version
repoXML = self.repoXML
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1406, in
<lambda>
repoXML = property(fget=lambda self: self._getRepoXML(),
File "/usr/share/yum-plugins/rhnplugin.py", line 508, in _getRepoXML
return YumRepository._getRepoXML(self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1398, in
_getRepoXML
self._loadRepoXML(text=self)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1388, in
_loadRepoXML
return self._groupLoadRepoXML(text, ["primary"])
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1372, in
_groupLoadRepoXML
if self._commonLoadRepoXML(text):
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 1208, in
_commonLoadRepoXML
result = self._getFileRepoXML(local, text)
File "/usr/lib/python2.4/site-packages/yum/yumRepo.py", line 989, in
_getFileRepoXML
cache=self.http_caching == 'all')
File "/usr/share/yum-plugins/rhnplugin.py", line 322, in _getFile
start, end, copy_local, checkfunc, text, reget, cache, size)
File "/usr/share/yum-plugins/rhnplugin.py", line 415, in
_noExceptionWrappingGet
result = self.grab.urlgrab(remote, local,
File "/usr/share/yum-plugins/rhnplugin.py", line 476, in <lambda>
grab = property(lambda self: self._getgrab())
File "/usr/share/yum-plugins/rhnplugin.py", line 471, in _getgrab
self._setupGrab()
File "/usr/share/yum-plugins/rhnplugin.py", line 448, in _setupGrab
del(ugopts["http_headers"])
KeyError: 'http_headers'
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py
b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 355a560..dc35889 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -437,6 +437,8 @@ class RhnRepo(YumRepository):
try:
ugopts = self._default_grabopts()
+ if "http_headers" in ugopts:
+ del(ugopts["http_headers"])
except AttributeError: # this method does not exist on RHEL5
ugopts = { 'keepalive': self.keepalive,
'bandwidth': self.bandwidth,
@@ -445,7 +447,6 @@ class RhnRepo(YumRepository):
'proxies': self.proxy_dict,
'timeout': self.timeout,
}
- del(ugopts["http_headers"])
headers = tuple(YumRepository._YumRepository__headersListFromDict(self))
self._grabfunc = URLGrabber(