proxy/proxy/Makefile.proxy | 2
proxy/proxy/spacewalk-proxy.spec | 7 ++-
proxy/proxy/xxmlrpclib.py | 82 ---------------------------------------
rel-eng/packages/spacewalk-proxy | 2
4 files changed, 7 insertions(+), 86 deletions(-)
New commits:
commit 7ea1a88e1481719685de6637b213a4ee7805943a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 09:59:07 2011 +0100
Automatic commit of package [spacewalk-proxy] release [1.3.8-1].
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index 817334f..b83ca85 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -4,7 +4,7 @@ Group: Applications/Internet
License: GPLv2
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.3.7
+Version: 1.3.8
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python
@@ -331,6 +331,10 @@ fi
%changelog
+* Tue Jan 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.8-1
+- removed xxmlrpclib
+- Updating the copyright years to include 2010.
+
* Mon Dec 13 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.7-1
- fixed number of errors reported by pylint
diff --git a/rel-eng/packages/spacewalk-proxy b/rel-eng/packages/spacewalk-proxy
index 63ff367..872d0e4 100644
--- a/rel-eng/packages/spacewalk-proxy
+++ b/rel-eng/packages/spacewalk-proxy
@@ -1 +1 @@
-1.3.7-1 proxy/proxy/
+1.3.8-1 proxy/proxy/
commit 88f3cfb0a055c9cdb3f49e84bb8d74ba518bf38a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 09:57:42 2011 +0100
removed xxmlrpclib.py from makefile & spec
diff --git a/proxy/proxy/Makefile.proxy b/proxy/proxy/Makefile.proxy
index b80ed69..3273169 100644
--- a/proxy/proxy/Makefile.proxy
+++ b/proxy/proxy/Makefile.proxy
@@ -19,7 +19,7 @@ PACKAGES_LIST_DIR = $(PREFIX)/var/up2date/list
FILES = __init__ apacheHandler apacheServer responseContext \
rhnAuthCacheClient rhnAuthProtocol rhnConstants \
- rhnProxyAuth rhnShared xxmlrpclib
+ rhnProxyAuth rhnShared
TAR_EXCLUDE = install
SERVICE_SCRIPTS = rhn-proxy
diff --git a/proxy/proxy/spacewalk-proxy.spec b/proxy/proxy/spacewalk-proxy.spec
index bbe99ed..817334f 100644
--- a/proxy/proxy/spacewalk-proxy.spec
+++ b/proxy/proxy/spacewalk-proxy.spec
@@ -286,7 +286,6 @@ fi
%{destdir}/rhnAuthCacheClient.py*
%{destdir}/rhnProxyAuth.py*
%{destdir}/rhnAuthProtocol.py*
-%{destdir}/xxmlrpclib.py*
%attr(750,apache,apache) %dir %{_var}/spool/rhn-proxy
%attr(750,apache,apache) %dir %{_var}/spool/rhn-proxy/list
%attr(770,root,apache) %dir %{_var}/log/rhn
commit f88a9e29859edc8323830e1ce692b27bc2f0f2f3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Jan 4 09:53:16 2011 +0100
xxmlrpclib is unused after ce86cbdcdb2598a3a7e98cd9ccb38759dbef7a68
diff --git a/proxy/proxy/xxmlrpclib.py b/proxy/proxy/xxmlrpclib.py
deleted file mode 100644
index f8d9d8d..0000000
--- a/proxy/proxy/xxmlrpclib.py
+++ /dev/null
@@ -1,82 +0,0 @@
-# This module extends rhn.rpclib (an xmlrpclib.py wrapper) with null values and
-# handles UserDictCase properly.
-#-------------------------------------------------------------------------------
-#
-# Copyright (c) 2008--2010 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-#
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-#-------------------------------------------------------------------------------
-# $Id: xxmlrpclib.py,v 1.10 2005/07/05 17:39:03 wregglej Exp $
-
-## language imports
-from types import NoneType, InstanceType
-
-## extension imports
-from rhn import rpclib
-
-## local imports
-from spacewalk.common import UserDictCase
-
-class Marshaller(rpclib.xmlrpclib.Marshaller):
- """ Marshaller that understands NoneTypes
- FIXME: need to NOT use the static dispatch object it really interferes
- with the common code (hence I had to jump through hoops in
- proxy/rhnException.py - this will cause issues in the future.
-
- NOTE:
- In Python 2.3, the argument list to the Marshaller's dump_* methods
- gained an additional argument called 'write'. In order to make our
- custom dispatch methods backward-compatible with <= 2.2, we'll
- use an optional argument called "compat_args". If supplied, we
- assume this is the "write" argument required in >= Python 2.3
and
- pass it along if necessary.
- """
-
- def dump_null(self, value, *compat_args):
- self.write("<value><null/></value>\n")
- rpclib.xmlrpclib.Marshaller.dispatch[NoneType] = dump_null
-
- def dump_instance(self, value, *compat_args):
- if len(compat_args) > 0:
- # Python >= 2.3 version
-
- write = compat_args[0]
- if isinstance(value, UserDictCase):
- return self.dump_struct(value.dict(), write)
- rpclib.xmlrpclib.Marshaller.dump_instance(self, value, write)
- else:
- # Python < 2.3 version
-
- if isinstance(value, UserDictCase):
- return self.dump_struct(value.dict())
- rpclib.xmlrpclib.Marshaller.dump_instance(self, value)
- rpclib.xmlrpclib.Marshaller.dispatch[InstanceType] = dump_instance
-
-
-class Unmarshaller(rpclib.xmlrpclib.Unmarshaller):
- """ Unmarshaller that understands NoneTypes
- FIXME: need to NOT use the static dispatch object it really interferes
- with the common code (hence I had to jump through hoops in
- proxy/rhnException.py - this will cause issues in the future.
- """
- def end_null(self, join=None):
- self.append(None)
- rpclib.xmlrpclib.Unmarshaller.dispatch["null"] = end_null
-
-
-Fault = rpclib.xmlrpclib.Fault
-dumps = rpclib.xmlrpclib.dumps
-loads = rpclib.xmlrpclib.loads
-
-transports = rpclib.transports
-