client/rhel/rhn-client-tools/rhn-client-tools.spec | 7 +++-
client/rhel/rhnlib/rhn/connections.py | 36 ---------------------
client/rhel/rhnlib/rhnlib.spec | 5 ++
rel-eng/packages/rhn-client-tools | 2 -
rel-eng/packages/rhnlib | 2 -
5 files changed, 12 insertions(+), 40 deletions(-)
New commits:
commit 6ef8e1e32b935de57d16c1094d699ce53aeb2a56
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 16 09:09:22 2011 +0100
Automatic commit of package [rhn-client-tools] release [1.4.6-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec
b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 89ff635..4b96934 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.4.5
+Version: 1.4.6
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -292,6 +292,11 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Mar 16 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.6-1
+- 684245 - lookup of the subscription-manager page via localized title is
+ volatile, let's use its __module__ name. (jpazdziora(a)redhat.com)
+- 624748 - report virtual network interfaces (mzazrivec(a)redhat.com)
+
* Fri Mar 11 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.4.5-1
- declare that we are using utf-8
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 7b848c2..2a1cfe4 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.4.5-1 client/rhel/rhn-client-tools/
+1.4.6-1 client/rhel/rhn-client-tools/
commit a4fee5b69766173d0b97818b3e59a1deff0ea315
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 16 09:09:08 2011 +0100
Automatic commit of package [rhnlib] release [2.5.36-1].
diff --git a/client/rhel/rhnlib/rhnlib.spec b/client/rhel/rhnlib/rhnlib.spec
index 07554f4..97c196f 100644
--- a/client/rhel/rhnlib/rhnlib.spec
+++ b/client/rhel/rhnlib/rhnlib.spec
@@ -4,7 +4,7 @@ Summary: Python libraries for the RHN project
Name: rhnlib
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 2.5.35
+Version: 2.5.36
Release: 1%{?dist}
Group: Development/Libraries
@@ -61,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/*
%changelog
+* Wed Mar 16 2011 Miroslav Suchý <msuchy(a)redhat.com> 2.5.36-1
+- code cleanup - remove HTTPResponse.read() override
+
* Fri Mar 11 2011 Miroslav Suchý <msuchy(a)redhat.com> 2.5.35-1
- 683200 - create idn_ascii_to_pune() and idn_pune_to_unicode(), which will
take care about corner cases of encodings.idna
diff --git a/rel-eng/packages/rhnlib b/rel-eng/packages/rhnlib
index 6cfdd9f..07a2d67 100644
--- a/rel-eng/packages/rhnlib
+++ b/rel-eng/packages/rhnlib
@@ -1 +1 @@
-2.5.35-1 client/rhel/rhnlib/
+2.5.36-1 client/rhel/rhnlib/
commit f7b8620874aa3a483413c977c08596812fcc0ec8
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Mar 16 09:08:42 2011 +0100
code cleanup - remove HTTPResponse.read() override
this has been fixed in python 2.0?
Anyway fix is definitelly in python in RHEL5
no need to have it here
see
http://python.org/sf/988120
diff --git a/client/rhel/rhnlib/rhn/connections.py
b/client/rhel/rhnlib/rhn/connections.py
index 884de9e..a1b5431 100644
--- a/client/rhel/rhnlib/rhn/connections.py
+++ b/client/rhel/rhnlib/rhn/connections.py
@@ -25,42 +25,6 @@ class HTTPResponse(httplib.HTTPResponse):
self.fp = nonblocking.NonBlockingFile(self.fp)
self.fp.set_callback(rs, ws, ex, user_data, callback)
- # Fix a bug in the upstream read() method - partial reads will incorrectly
- # update self.length with the intended, not the real, amount of bytes
- # See
http://python.org/sf/988120
- def read(self, amt=None):
- if self.fp is None:
- return ''
-
- if self.chunked:
- return self._read_chunked(amt)
-
- if amt is None:
- # unbounded read
- if self.will_close:
- s = self.fp.read()
- else:
- s = self._safe_read(self.length)
- self.close() # we read everything
- return s
-
- if self.length is not None:
- if amt > self.length:
- # clip the read to the "end of response"
- amt = self.length
-
- # we do not use _safe_read() here because this may be a .will_close
- # connection, and the user is reading more bytes than will be provided
- # (for example, reading in 1k chunks)
- s = self.fp.read(amt)
-
- if self.length is not None:
- # Update the length with the amount of bytes we actually read
- self.length = self.length - len(s)
-
- return s
-
-
class HTTPConnection(httplib.HTTPConnection):
response_class = HTTPResponse