backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit c65ff140fd719b8ff8b248d6ae492956b93949e1
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 3 13:06:28 2010 +0100
Automatic commit of package [spacewalk-backend] release [1.3.21-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 9d8a3e6..eb30dcf 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.20
+Version: 1.3.21
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Dec 03 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.21-1
+- Fault, ResponseError and ProtocolError import has been removed from rpclib
+- File import has been removed from rpclib
+- fixed column aliases (PG)
+
* Wed Dec 01 2010 Jan Pazdziora 1.3.20-1
- Ignore the %check results for now.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 95f6e12..7538e3d 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.20-1 backend/
+1.3.21-1 backend/
13 years, 4 months
2 commits - backend/common backend/satellite_tools backend/server
by Michael Mraka
backend/common/rhnRepository.py | 4 ++--
backend/satellite_tools/connection.py | 2 +-
backend/satellite_tools/rhn_satellite_activate.py | 7 ++++---
backend/satellite_tools/satsync.py | 4 ++--
backend/satellite_tools/xmlDiskDumper.py | 6 +++---
backend/satellite_tools/xmlWireSource.py | 14 +++++++-------
backend/server/apacheRequest.py | 18 +++++++++---------
backend/server/handlers/xmlrpc/up2date.py | 6 +++---
backend/server/rhnRepository.py | 2 +-
9 files changed, 32 insertions(+), 31 deletions(-)
New commits:
commit 2a12424b4c4160e506f8dc78d4652f59c359effb
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 3 10:36:45 2010 +0100
direct Fault, ResponseError and ProtocolError import has been removed from rpclib
diff --git a/backend/satellite_tools/rhn_satellite_activate.py b/backend/satellite_tools/rhn_satellite_activate.py
index 82e24fb..96c6222 100644
--- a/backend/satellite_tools/rhn_satellite_activate.py
+++ b/backend/satellite_tools/rhn_satellite_activate.py
@@ -79,7 +79,8 @@ def openGzippedFile(filename):
def getXmlrpcServer(server, handler, proxy, proxyUser, proxyPass,
sslCertPath, sslYN=1):
""" Return an XML-RPC Server connection object; no ssl if sslCertPath==None.
- May return rpclib.Fault, rpclib.ProtocolError, or socket.error.
+ May return rpclib.xmlrpclib.Fault, rpclib.xmlrpclib.ProtocolError,
+ or socket.error.
"""
_uri = server + handler
@@ -287,7 +288,7 @@ def activateSatellite_remote(options):
if options.verbose:
print "Executing: remote XMLRPC deactivation (if necessary)."
ret = s.satellite.deactivate_satellite(systemid, rhn_cert)
- except rpclib.Fault, f:
+ except rpclib.xmlrpclib.Fault, f:
# 1025 results in "satellite_not_activated"
if abs(f.faultCode) != 1025:
sys.stderr.write('ERROR: unhandled XMLRPC fault upon '
@@ -303,7 +304,7 @@ def activateSatellite_remote(options):
if options.verbose:
print "Executing: remote XMLRPC activation call."
ret = s.satellite.activate_satellite(systemid, rhn_cert)
- except rpclib.Fault, f:
+ except rpclib.xmlrpclib.Fault, f:
sys.stderr.write("Error reported from RHN: %s\n" % f)
# NOTE: we support the old (pre-cactus) web-handler API and the new.
# The old web handler used faultCodes of 1|-1 and the new API uses
diff --git a/backend/satellite_tools/satsync.py b/backend/satellite_tools/satsync.py
index 63a6f60..f825ca3 100644
--- a/backend/satellite_tools/satsync.py
+++ b/backend/satellite_tools/satsync.py
@@ -189,7 +189,7 @@ class Runner:
self.syncer.initialize()
except (KeyboardInterrupt, SystemExit):
raise
- except xmlWireSource.rpclib.Fault, e:
+ except xmlWireSource.rpclib.xmlrpclib.Fault, e:
if CFG.ISS_PARENT:
# we met old satellite who do not know ISS
log(-1, ['', messages.iss_not_available ], )
@@ -279,7 +279,7 @@ class Runner:
return 1
except (KeyboardInterrupt, SystemExit):
raise
- except xmlWireSource.rpclib.Fault, e:
+ except xmlWireSource.rpclib.xmlrpclib.Fault, e:
log(-1, messages.failed_step % (step_name, e.faultString))
return 1
except Exception, e:
diff --git a/backend/satellite_tools/xmlDiskDumper.py b/backend/satellite_tools/xmlDiskDumper.py
index 5b8bb6d..c757e53 100644
--- a/backend/satellite_tools/xmlDiskDumper.py
+++ b/backend/satellite_tools/xmlDiskDumper.py
@@ -122,7 +122,7 @@ class Dumper:
while 1:
try:
stream = self._getInputStream()
- except rpclib.ProtocolError:
+ except rpclib.xmlrpclib.ProtocolError:
if tries == 0:
# No more tries
raise
@@ -342,7 +342,7 @@ class BinaryRPMDumper(ShortPackageDumper):
filename = self._getFile()
try:
ShortPackageDumper.dump(self, force=force)
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
if e.faultCode in (-3003, -3007):
# Missing file
print "Missing package", self._mixin.id
@@ -399,7 +399,7 @@ class KickstartFilesDumper(KickstartDataDumper):
self.compression = 0
try:
return Dumper.dump(self, force=force)
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
if e.faultCode in (-3003, -3007):
# Missing file
print "Missing file", self._mixin.relative_path
diff --git a/backend/satellite_tools/xmlWireSource.py b/backend/satellite_tools/xmlWireSource.py
index 3a829b8..b612c85 100644
--- a/backend/satellite_tools/xmlWireSource.py
+++ b/backend/satellite_tools/xmlWireSource.py
@@ -153,7 +153,7 @@ class BaseWireSource:
try:
stream = apply(func, params)
return stream
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
p = tuple(['<the systemid>'] + list(params[1:]))
lastErrorMsg = 'ERROR: server.%s%s: %s' % (method, p, e)
log2(-1, 2, lastErrorMsg, stream=sys.stderr)
@@ -162,7 +162,7 @@ class BaseWireSource:
# do not reraise this exception!
except (KeyboardInterrupt, SystemExit):
raise
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
lastErrorMsg = e.faultString
break
except Exception, e:
@@ -292,7 +292,7 @@ class XMLRPCWireSource(BaseWireSource):
except TypeError, e:
log(-1, 'ERROR: during "apply(getattr(BaseWireSource.serverObj, %s), %s)"' % (function, params))
raise
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
log2(-1, 2, 'ERROR: ProtocolError: %s' % e, stream=sys.stderr)
raise
return retval
@@ -308,7 +308,7 @@ class AuthWireSource(XMLRPCWireSource):
log(2, ' +++ Satellite synchronization tool checking in.')
try:
authYN = self._xmlrpc('authentication.check', (self.systemid,))
- except (rpclib.ProtocolError, rpclib.Fault), e:
+ except (rpclib.xmlrpclib.ProtocolError, rpclib.xmlrpclib.Fault), e:
# bug 141197: the logging of all exceptions is handled higher up in
# the call stack
# log2(-1, 1, ' ERROR: %s' % e, stream=sys.stderr)
@@ -333,7 +333,7 @@ class CertWireSource(XMLRPCWireSource):
#log(2, ' +++ Satellite synchronization tool downloading certificate.')
try:
cert = self._xmlrpc("certificate.download", (self.systemid, ))
- except rpclib.Fault, e:
+ except rpclib.xmlrpclib.Fault, e:
log(-1, ' --- Unable to download the satellite certificate')
log(-1, ' ERROR: %s' % e, stream=sys.stderr)
sys.exit(-1)
@@ -382,7 +382,7 @@ class RPCGetWireSource(BaseWireSource):
try:
login_token = self.getServer().authentication.login(self.systemid)
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
log2(-1, 2, 'ERROR: ProtocolError: %s' % e, stream=sys.stderr)
raise
return login_token
@@ -400,7 +400,7 @@ class RPCGetWireSource(BaseWireSource):
for i in range(cfg['networkRetries']):
try:
ret = apply(getattr(get_server_obj, function_name), params)
- except rpclib.ProtocolError, e:
+ except rpclib.xmlrpclib.ProtocolError, e:
# We have two codes to check: the HTTP error code, and the
# combination (failtCode, faultString) encoded in the headers
# of the request.
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index c622c6c..8888ddf 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -99,7 +99,7 @@ class apacheRequest:
msg = open(CFG.MESSAGE_TO_ALL).read()
log_debug(3, "Sending message to all clients: %s" % msg)
# Send the message as a fault.
- response = rpclib.Fault(
+ response = rpclib.xmlrpclib.Fault(
-1, _("IMPORTANT MESSAGE FOLLOWS:\n%s") % msg)
# and now send everything back
ret = self.response(response)
@@ -124,7 +124,7 @@ class apacheRequest:
if sys.exc_type == UnknownXML:
fault = -1
e_type, e_value = sys.exc_info()[:2]
- response = rpclib.Fault(fault, _(
+ response = rpclib.xmlrpclib.Fault(fault, _(
"While running '%s': caught\n%s : %s\n") % (
method, e_type, e_value))
Traceback(method, self.req,
@@ -186,7 +186,7 @@ class apacheRequest:
# convert a response to the right type for passing back to
# rpclib.xmlrpclib.dumps
def normalize(self, response):
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
return response
return (response,)
@@ -307,7 +307,7 @@ class apacheRequest:
transfer=transports.lookupTransfer(self.input.transfer),
encoding=transports.lookupEncoding(self.input.encoding))
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
log_debug(4, "Return FAULT",
response.faultCode, response.faultString)
# No compression for faults because we'd like them to pop
@@ -387,7 +387,7 @@ class apachePOST(apacheRequest):
self.parser.feed(data)
except IndexError:
# malformed XML data
- raise rpclib.ResponseError
+ raise rpclib.xmlrpclib.ResponseError
self.parser.close()
# extract the method and arguments; we pass the exceptions through
@@ -461,7 +461,7 @@ class apachePOST(apacheRequest):
# Decode the request; avoid logging crappy responses
try:
params, method = self.decode(_body)
- except rpclib.ResponseError:
+ except rpclib.xmlrpclib.ResponseError:
log_error("Got bad XML-RPC blob of len = %d" % len(_body))
return apache.HTTP_BAD_REQUEST
else:
@@ -569,7 +569,7 @@ class GetHandler(apacheRequest):
# since we have to stick the error message in the HTTP header,
# and to return an Apache error code
- if isinstance(response, rpclib.Fault):
+ if isinstance(response, rpclib.xmlrpclib.Fault):
log_debug(4, "Return FAULT",
response.faultCode, response.faultString)
retcode = apache.HTTP_NOT_FOUND
commit 6fbdcc38769b67d905c1b4d93c9c45853321ff67
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Dec 3 10:36:45 2010 +0100
direct File import has been removed from rpclib
diff --git a/backend/common/rhnRepository.py b/backend/common/rhnRepository.py
index 4ca1bad..6e5cda4 100644
--- a/backend/common/rhnRepository.py
+++ b/backend/common/rhnRepository.py
@@ -143,7 +143,7 @@ class Repository(RPC_Base):
data = self._getHeaderFromFile(filePath)
# XXX: Interesting. Found that if returned just data, this
# function works fine. Investigate later.
- return rpclib.File(cStringIO.StringIO(data), len(data))
+ return rpclib.transports.File(cStringIO.StringIO(data), len(data))
# The real workhorse for all flavors of listall
# It tries to pull data out of a file; if it doesn't work,
@@ -163,7 +163,7 @@ class Repository(RPC_Base):
length = features['length']
lastModified = features['lastModified']
self._set_last_modified(lastModified)
- return rpclib.File(open(filePath, "rb"), length, name=filePath)
+ return rpclib.transports.File(open(filePath, "rb"), length, name=filePath)
def _getHeaderFromFile(self, filePath, stat_info=None):
""" Utility function to extract a header from an rpm.
diff --git a/backend/satellite_tools/connection.py b/backend/satellite_tools/connection.py
index 9be0a64..b7b1ebb 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -56,7 +56,7 @@ class Transport(rpclib.transports.Transport):
# XXX application/octet-stream should go away
if content_type in ('application/xml', 'application/octet-stream',
'application/x-rpm'):
- f = rpclib.File(fd)
+ f = rpclib.transports.File(fd)
# Explanation copied from the base class' method (rhn.transports):
# Set the File's close method to the connection's
# Note that calling the HTTPResponse's close() is not enough,
diff --git a/backend/server/apacheRequest.py b/backend/server/apacheRequest.py
index 30679bf..c622c6c 100644
--- a/backend/server/apacheRequest.py
+++ b/backend/server/apacheRequest.py
@@ -240,7 +240,7 @@ class apacheRequest:
self.req.headers_out["Content-Length"] = str(response_size)
# if we loaded this from a real fd, set it as the X-Replace-Content
- # check for "name" since sometimes we get xmlrpclib.File's that have
+ # check for "name" since sometimes we get xmlrpclib.transports.File's that have
# a stringIO as the file_obj, and they dont have a .name (ie,
# fileLists...)
if response.name:
@@ -290,7 +290,7 @@ class apacheRequest:
compress_response = rhnFlags.test("compress_response")
# Init an output object; we'll use it for sending data in various
# formats
- if isinstance(response, rpclib.File):
+ if isinstance(response, rpclib.transports.File):
if not hasattr(response.file_obj, 'fileno') and compress_response:
# This is a StringIO that has to be compressed, so read it in
# memory; mark that we don't have to do any xmlrpc encoding
diff --git a/backend/server/handlers/xmlrpc/up2date.py b/backend/server/handlers/xmlrpc/up2date.py
index b34fc15..efe7fca 100644
--- a/backend/server/handlers/xmlrpc/up2date.py
+++ b/backend/server/handlers/xmlrpc/up2date.py
@@ -287,7 +287,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_package_path_compat_arches(self.server_id,
package, server.archname)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def source_package(self, system_id, package):
@@ -309,7 +309,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_source_package_path_by_nvre(self.server_id,
package)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def source_package_by_name(self, system_id, filename):
@@ -329,7 +329,7 @@ class Up2date(rhnHandler):
filePath = rhnPackage.get_source_package_path_by_name(self.server_id,
filename)
- return rpclib.File(open(filePath, "r"), name=filePath)
+ return rpclib.transports.File(open(filePath, "r"), name=filePath)
def solvedep(self, system_id, deps):
diff --git a/backend/server/rhnRepository.py b/backend/server/rhnRepository.py
index 5162784..09f2cf0 100644
--- a/backend/server/rhnRepository.py
+++ b/backend/server/rhnRepository.py
@@ -195,7 +195,7 @@ class Repository(rhnRepository.Repository):
log_debug(2, "Unknown repomd file requested: %s" % file_name)
raise rhnFault(6)
- output = rpclib.File(output, name=file_name)
+ output = rpclib.transports.File(output, name=file_name)
rhnFlags.set('Content-Type', content_type)
13 years, 4 months
Changes to 'refs/tags/rhn-client-tools-1.3.2-1'
by Miroslav Suchý
Tag 'rhn-client-tools-1.3.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2010-12-03 10:34 +0000
Tagging package [rhn-client-tools] version [1.3.2-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-web-1.3.10-1:
Jan Blazek (2):
Add comps for RHEL6
Add comps for RHEL6 (server part)
Miroslav Suchý (4):
656753 - fix TB during rhn_package_manager -v -l
656753 - add namespace prefix to merged functions
on el5 do not send IPv6 addresses
Automatic commit of package [rhn-client-tools] release [1.3.2-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 9
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5
proxy/proxy/pm/uploadLib.py | 8
rel-eng/comps/comps-spacewalk-client-rhel6.xml | 42 +
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 260 ++++++++++++
rel-eng/packages/rhn-client-tools | 2
6 files changed, 318 insertions(+), 8 deletions(-)
---
13 years, 4 months
2 commits - client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 9 ++++++++-
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 5 +++--
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
New commits:
commit 1703a993f3fb2cbbb5a8439684b3b8f156cf3b21
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 3 11:34:35 2010 +0100
Automatic commit of package [rhn-client-tools] release [1.3.2-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index 3e8668a..fb9496e 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.3.1
+Version: 1.3.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -290,6 +290,9 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Fri Dec 03 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.2-1
+- on el5 do not send IPv6 addresses (msuchy(a)redhat.com)
+
* Sat Nov 20 2010 Miroslav Suchý <msuchy(a)redhat.com> 1.3.1-1
- 655310 - replace gethostbyname by getaddrinfo (msuchy(a)redhat.com)
- 655310 - send IPv6 addresses to server (msuchy(a)redhat.com)
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 30ff56f..b7b7840 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.3.1-1 client/rhel/rhn-client-tools/
+1.3.2-1 client/rhel/rhn-client-tools/
commit eede1380199aa1f8d561dea0d753970fcbc1fd30
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Fri Dec 3 11:33:08 2010 +0100
on el5 do not send IPv6 addresses
this will require python-ethtool >= 0.4, which will require libnl >= 1.1, which is not there
so on el5 we will get here
AttributeError: 'module' object has no attribute 'get_interfaces_info'
lets ignore it.
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d97c8e0..3e8668a 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -15,7 +15,11 @@ BuildRequires: update-desktop-files
Requires: rhnlib >= 2.5.20
Requires: rpm >= 4.2.3-24_nonptl
Requires: rpm-python
+%if 0%{?rhel} && 0%{?rhel} <= 5
+Requires: python-ethtool
+%else
Requires: python-ethtool >= 0.4
+%endif
Requires: gnupg
Requires: sh-utils
Requires: dbus-python
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index acd747f..0cb3ffe 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -532,14 +532,15 @@ def read_network_interfaces():
ip6_list = []
try:
+ dev_info = ethtool.get_interfaces_info(interface)
# one interface may have more IPv6 addresses
- for ip6 in dev.get_ipv6_addresses():
+ for ip6 in dev_info.get_ipv6_addresses():
ip6_list.append({
'scope': ip6.scope,
'addr': ip6.address,
'netmask': ip6.netmask
})
- except:
+ except: #this will does not work on el5, ignore it
pass
intDict[interface] = {'hwaddr':hwaddr,
'ipaddr':ipaddr,
13 years, 4 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 260 +++++++++++++++++++++++++
1 file changed, 260 insertions(+)
New commits:
commit b88e082fbb17ef1df70ff30ff60a73f62999833c
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Fri Dec 3 11:01:34 2010 +0100
Add comps for RHEL6 (server part)
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
new file mode 100644
index 0000000..7890a31
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-server</id>
+ <name>Spacewalk Server</name>
+ <description>Spacewalk Server Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+ <packagereq type="default">ant-contrib</packagereq>
+ <packagereq type="default">ant-contrib-javadoc</packagereq>
+ <packagereq type="default">ant-contrib-manual</packagereq>
+ <packagereq type="default">asm</packagereq>
+ <packagereq type="default">asm-javadoc</packagereq>
+ <packagereq type="default">bea-stax</packagereq>
+ <packagereq type="default">bea-stax-api</packagereq>
+ <packagereq type="default">bea-stax-javadoc</packagereq>
+ <packagereq type="default">c3p0</packagereq>
+ <packagereq type="default">c3p0-javadoc</packagereq>
+ <packagereq type="default">cglib</packagereq>
+ <packagereq type="default">cglib-demo</packagereq>
+ <packagereq type="default">cglib-javadoc</packagereq>
+ <packagereq type="default">cglib-nohook</packagereq>
+ <packagereq type="default">cglib-repolib</packagereq>
+ <packagereq type="default">chameleon</packagereq>
+ <packagereq type="default">concurrent</packagereq>
+ <packagereq type="default">concurrent-javadoc</packagereq>
+ <packagereq type="default">concurrent-repolib</packagereq>
+ <packagereq type="default">cx_Oracle</packagereq>
+ <packagereq type="default">dom4j</packagereq>
+ <packagereq type="default">dom4j-demo</packagereq>
+ <packagereq type="default">dom4j-javadoc</packagereq>
+ <packagereq type="default">dom4j-manual</packagereq>
+ <packagereq type="default">dom4j-repolib</packagereq>
+ <packagereq type="default">ehcache</packagereq>
+ <packagereq type="default">ehcache-hibernate</packagereq>
+ <packagereq type="default">ehcache-javadoc</packagereq>
+ <packagereq type="default">eventReceivers</packagereq>
+ <packagereq type="default">heirloom-pkgtools</packagereq>
+ <packagereq type="default">hibernate3</packagereq>
+ <packagereq type="default">hibernate3-javadoc</packagereq>
+ <packagereq type="default">hibernate3-manual</packagereq>
+ <packagereq type="default">hibernate3-repolib</packagereq>
+ <packagereq type="default">icu4j</packagereq>
+ <packagereq type="default">icu4j-javadoc</packagereq>
+ <packagereq type="default">isorelax</packagereq>
+ <packagereq type="default">isorelax-javadoc</packagereq>
+ <packagereq type="default">jabberd-selinux</packagereq>
+ <packagereq type="default">jakarta-commons-cli</packagereq>
+ <packagereq type="default">jakarta-commons-cli-javadoc</packagereq>
+ <packagereq type="default">jakarta-commons-configuration</packagereq>
+ <packagereq type="default">jakarta-commons-configuration-javadoc</packagereq>
+ <packagereq type="default">jakarta-commons-io</packagereq>
+ <packagereq type="default">jakarta-commons-io-javadoc</packagereq>
+ <packagereq type="default">jaxen</packagereq>
+ <packagereq type="default">jaxen-demo</packagereq>
+ <packagereq type="default">jaxen-javadoc</packagereq>
+ <packagereq type="default">jaxen-manual</packagereq>
+ <packagereq type="default">jaxen-repolib</packagereq>
+ <packagereq type="default">jcommon</packagereq>
+ <packagereq type="default">jcommon-javadoc</packagereq>
+ <packagereq type="default">jcommon-repolib</packagereq>
+ <packagereq type="default">jcommon-test</packagereq>
+ <packagereq type="default">jpam</packagereq>
+ <packagereq type="default">jpam-javadoc</packagereq>
+ <packagereq type="default">MessageQueue</packagereq>
+ <packagereq type="default">msv</packagereq>
+ <packagereq type="default">msv-demo</packagereq>
+ <packagereq type="default">msv-javadoc</packagereq>
+ <packagereq type="default">msv-manual</packagereq>
+ <packagereq type="default">msv-relames</packagereq>
+ <packagereq type="default">msv-relames-javadoc</packagereq>
+ <packagereq type="default">msv-rngconv</packagereq>
+ <packagereq type="default">msv-xmlgen</packagereq>
+ <packagereq type="default">msv-xmlgen-javadoc</packagereq>
+ <packagereq type="default">msv-xsdlib</packagereq>
+ <packagereq type="default">msv-xsdlib-javadoc</packagereq>
+ <packagereq type="default">nocpulse-common</packagereq>
+ <packagereq type="default">nocpulse-db-perl</packagereq>
+ <packagereq type="default">NOCpulsePlugins</packagereq>
+ <packagereq type="default">NOCpulsePlugins-Oracle</packagereq>
+ <packagereq type="default">NPalert</packagereq>
+ <packagereq type="default">nutch</packagereq>
+ <packagereq type="default">oracle-instantclient-selinux</packagereq>
+ <packagereq type="default">oracle-instantclient-sqlplus-selinux</packagereq>
+ <packagereq type="default">oracle-lib-compat</packagereq>
+ <packagereq type="default">oracle-nofcontext-selinux</packagereq>
+ <packagereq type="default">oracle-rhnsat-selinux</packagereq>
+ <packagereq type="default">oracle-selinux</packagereq>
+ <packagereq type="default">oracle-xe-selinux</packagereq>
+ <packagereq type="default">osa-dispatcher</packagereq>
+ <packagereq type="default">osa-dispatcher-selinux</packagereq>
+ <packagereq type="default">oscache</packagereq>
+ <packagereq type="default">oscache-javadoc</packagereq>
+ <packagereq type="default">oscache-manual</packagereq>
+ <packagereq type="default">perl-Apache-Admin-Config</packagereq>
+ <packagereq type="default">perl-Authen-PAM</packagereq>
+ <packagereq type="default">perl-Class-Loader</packagereq>
+ <packagereq type="default">perl-Convert-ASCII-Armour</packagereq>
+ <packagereq type="default">perl-Convert-PEM</packagereq>
+ <packagereq type="default">perl-Crypt-Blowfish</packagereq>
+ <packagereq type="default">perl-Crypt-CAST5_PP</packagereq>
+ <packagereq type="default">perl-Crypt-CBC</packagereq>
+ <packagereq type="default">perl-Crypt-DES</packagereq>
+ <packagereq type="default">perl-Crypt-DES_EDE3</packagereq>
+ <packagereq type="default">perl-Data-Buffer</packagereq>
+ <packagereq type="default">perl-DateTime-Locale</packagereq>
+ <packagereq type="default">perl-DateTime-TimeZone</packagereq>
+ <packagereq type="default">perl-DBD-Oracle</packagereq>
+ <packagereq type="default">perl-DBD-Oracle-explain</packagereq>
+ <packagereq type="default">perl-Error</packagereq>
+ <packagereq type="default">perl-FreezeThaw</packagereq>
+ <packagereq type="default">perl-IO-stringy</packagereq>
+ <packagereq type="default">perl-Mail-RFC822-Address</packagereq>
+ <packagereq type="default">perl-Network-IPv4Addr</packagereq>
+ <packagereq type="default">perl-NOCpulse-CLAC</packagereq>
+ <packagereq type="default">perl-NOCpulse-Debug</packagereq>
+ <packagereq type="default">perl-NOCpulse-Gritch</packagereq>
+ <packagereq type="default">perl-NOCpulse-Object</packagereq>
+ <packagereq type="default">perl-NOCpulse-OracleDB</packagereq>
+ <packagereq type="default">perl-NOCpulse-PersistentConnection</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe</packagereq>
+ <packagereq type="default">perl-NOCpulse-Probe-Oracle</packagereq>
+ <packagereq type="default">perl-NOCpulse-ProcessPool</packagereq>
+ <packagereq type="default">perl-NOCpulse-Scheduler</packagereq>
+ <packagereq type="default">perl-NOCpulse-SetID</packagereq>
+ <packagereq type="default">perl-NOCpulse-Utils</packagereq>
+ <packagereq type="default">perl-RPM2</packagereq>
+ <packagereq type="default">perl-Satcon</packagereq>
+ <packagereq type="default">perl-Sort-Versions</packagereq>
+ <packagereq type="default">perl-Tie-EncryptedHash</packagereq>
+ <packagereq type="default">perl-XML-Generator</packagereq>
+ <packagereq type="default">ProgAGoGo</packagereq>
+ <packagereq type="default">PyPAM</packagereq>
+ <packagereq type="default">python-ethtool</packagereq>
+ <packagereq type="default">python-gzipstream</packagereq>
+ <packagereq type="default">python-debian</packagereq>
+ <packagereq type="default">quartz</packagereq>
+ <packagereq type="default">quartz-oracle</packagereq>
+ <packagereq type="default">redstone-xmlrpc</packagereq>
+ <packagereq type="default">relaxngDatatype</packagereq>
+ <packagereq type="default">relaxngDatatype-javadoc</packagereq>
+ <packagereq type="default">rhn-oracle-jdbc</packagereq>
+ <packagereq type="default">rhn-oracle-jdbc-tomcat5</packagereq>
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhnpush</packagereq>
+ <packagereq type="default">SatConfig-bootstrap</packagereq>
+ <packagereq type="default">SatConfig-bootstrap-server</packagereq>
+ <packagereq type="default">SatConfig-cluster</packagereq>
+ <packagereq type="default">SatConfig-dbsynch</packagereq>
+ <packagereq type="default">SatConfig-general</packagereq>
+ <packagereq type="default">SatConfig-generator</packagereq>
+ <packagereq type="default">SatConfig-installer</packagereq>
+ <packagereq type="default">SatConfig-spread</packagereq>
+ <packagereq type="default">scdb</packagereq>
+ <packagereq type="default">servletapi4</packagereq>
+ <packagereq type="default">servletapi4-javadoc</packagereq>
+ <packagereq type="default">simple-core</packagereq>
+ <packagereq type="default">sitemesh</packagereq>
+ <packagereq type="default">sitemesh-javadoc</packagereq>
+ <packagereq type="default">SNMPAlerts</packagereq>
+ <packagereq type="default">spacecmd</packagereq>
+ <packagereq type="default">spacewalk</packagereq>
+ <packagereq type="default">spacewalk-admin</packagereq>
+ <packagereq type="default">spacewalk-backend</packagereq>
+ <packagereq type="default">spacewalk-backend-app</packagereq>
+ <packagereq type="default">spacewalk-backend-applet</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-common</packagereq>
+ <packagereq type="default">spacewalk-backend-config-files-tool</packagereq>
+ <packagereq type="default">spacewalk-backend-iss</packagereq>
+ <packagereq type="default">spacewalk-backend-iss-export</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-package-push-server</packagereq>
+ <packagereq type="default">spacewalk-backend-server</packagereq>
+ <packagereq type="default">spacewalk-backend-sql</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-oracle</packagereq>
+ <packagereq type="default">spacewalk-backend-sql-postgresql</packagereq>
+ <packagereq type="default">spacewalk-backend-tools</packagereq>
+ <packagereq type="default">spacewalk-backend-upload-server</packagereq>
+ <packagereq type="default">spacewalk-backend-xml-export-libs</packagereq>
+ <packagereq type="default">spacewalk-backend-xmlrpc</packagereq>
+ <packagereq type="default">spacewalk-backend-xp</packagereq>
+ <packagereq type="default">spacewalk-base</packagereq>
+ <packagereq type="default">spacewalk-base-minimal</packagereq>
+ <packagereq type="default">spacewalk-branding</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-client-repo</packagereq>
+ <packagereq type="default">spacewalk-common</packagereq>
+ <packagereq type="default">spacewalk-config</packagereq>
+ <packagereq type="default">spacewalk-cypress</packagereq>
+ <packagereq type="default">spacewalk-dobby</packagereq>
+ <packagereq type="default">spacewalk-doc-indexes</packagereq>
+ <packagereq type="default">spacewalk-grail</packagereq>
+ <packagereq type="default">spacewalk-html</packagereq>
+ <packagereq type="default">spacewalk-java</packagereq>
+ <packagereq type="default">spacewalk-java-config</packagereq>
+ <packagereq type="default">spacewalk-java-lib</packagereq>
+ <packagereq type="default">spacewalk-java-oracle</packagereq>
+ <packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="default">spacewalk-monitoring</packagereq>
+ <packagereq type="default">spacewalk-monitoring-selinux</packagereq>
+ <packagereq type="default">spacewalk-moon</packagereq>
+ <packagereq type="default">spacewalk-oracle</packagereq>
+ <packagereq type="default">spacewalk-postgresql</packagereq>
+ <packagereq type="default">spacewalk-proxy</packagereq>
+ <packagereq type="default">spacewalk-proxy-broker</packagereq>
+ <packagereq type="default">spacewalk-proxy-common</packagereq>
+ <packagereq type="default">spacewalk-proxy-docs</packagereq>
+ <packagereq type="default">spacewalk-proxy-html</packagereq>
+ <packagereq type="default">spacewalk-proxy-installer</packagereq>
+ <packagereq type="default">spacewalk-proxy-management</packagereq>
+ <packagereq type="default">spacewalk-proxy-monitoring</packagereq>
+ <packagereq type="default">spacewalk-proxy-package-manager</packagereq>
+ <packagereq type="default">spacewalk-proxy-redirect</packagereq>
+ <packagereq type="default">spacewalk-proxy-selinux</packagereq>
+ <packagereq type="default">spacewalk-pxt</packagereq>
+ <packagereq type="default">spacewalk-repo</packagereq>
+ <packagereq type="default">spacewalk-reports</packagereq>
+ <packagereq type="default">spacewalk-schema</packagereq>
+ <packagereq type="default">spacewalk-search</packagereq>
+ <packagereq type="default">spacewalk-selinux</packagereq>
+ <packagereq type="default">spacewalk-setup</packagereq>
+ <packagereq type="default">spacewalk-setup-jabberd</packagereq>
+ <packagereq type="default">spacewalk-slf4j</packagereq>
+ <packagereq type="default">spacewalk-sniglets</packagereq>
+ <packagereq type="default">spacewalk-ssl-cert-check</packagereq>
+ <packagereq type="default">spacewalk-taskomatic</packagereq>
+ <packagereq type="default">spacewalk-utils</packagereq>
+ <packagereq type="default">spacewalk-web</packagereq>
+ <packagereq type="default">SputLite</packagereq>
+ <packagereq type="default">SputLite-client</packagereq>
+ <packagereq type="default">SputLite-server</packagereq>
+ <packagereq type="default">ssl_bridge</packagereq>
+ <packagereq type="default">status_log_acceptor</packagereq>
+ <packagereq type="default">stringtree-json</packagereq>
+ <packagereq type="default">tanukiwrapper</packagereq>
+ <packagereq type="default">tanukiwrapper-javadoc</packagereq>
+ <packagereq type="default">tanukiwrapper-manual</packagereq>
+ <packagereq type="default">tsdb</packagereq>
+ <packagereq type="default">ws-jaxme</packagereq>
+ <packagereq type="default">ws-jaxme-javadoc</packagereq>
+ <packagereq type="default">ws-jaxme-manual</packagereq>
+ <packagereq type="default">xom</packagereq>
+ <packagereq type="default">xom-demo</packagereq>
+ <packagereq type="default">xom-javadoc</packagereq>
+ <packagereq type="default">xpp2</packagereq>
+ <packagereq type="default">xpp2-demo</packagereq>
+ <packagereq type="default">xpp2-javadoc</packagereq>
+ <packagereq type="default">xpp2-manual</packagereq>
+ <packagereq type="default">xpp3</packagereq>
+ <packagereq type="default">xpp3-javadoc</packagereq>
+ <packagereq type="default">xpp3-minimal</packagereq>
+ </packagelist>
+ </group>
+</comps>
13 years, 4 months
rel-eng/comps
by jblazek
rel-eng/comps/comps-spacewalk-client-rhel6.xml | 42 +++++++++++++++++++++++++
1 file changed, 42 insertions(+)
New commits:
commit 1d80648c6fd0bb3ddfb77c5a67e8d60ef35b1899
Author: Jan Blazek <jblazek(a)redhat.com>
Date: Fri Dec 3 10:58:10 2010 +0100
Add comps for RHEL6
diff --git a/rel-eng/comps/comps-spacewalk-client-rhel6.xml b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
new file mode 100644
index 0000000..9ce8d92
--- /dev/null
+++ b/rel-eng/comps/comps-spacewalk-client-rhel6.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<!DOCTYPE comps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
+
+<comps>
+<!-- <meta> -->
+<!-- Meta information will go here eventually -->
+<!-- </meta> -->
+ <group>
+ <id>spacewalk-client</id>
+ <name>Spacewalk Client</name>
+ <description>Spacewalk Client Packages</description>
+ <uservisible>true</uservisible>
+ <packagelist>
+ <packagereq type="default">rhncfg</packagereq>
+ <packagereq type="default">rhncfg-actions</packagereq>
+ <packagereq type="default">rhncfg-client</packagereq>
+ <packagereq type="default">rhncfg-management</packagereq>
+ <packagereq type="default">rhn-custom-info</packagereq>
+ <packagereq type="default">osad</packagereq>
+ <packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">rhn-kickstart</packagereq>
+ <packagereq type="default">rhn-kickstart-common</packagereq>
+ <packagereq type="default">rhn-kickstart-virtualization</packagereq>
+ <packagereq type="default">rhn-virtualization</packagereq>
+ <packagereq type="default">rhn-virtualization-common</packagereq>
+ <packagereq type="default">rhn-virtualization-guest</packagereq>
+ <packagereq type="default">rhn-virtualization-host</packagereq>
+ <packagereq type="default">spacewalk-koan</packagereq>
+ <packagereq type="default">rhnlib</packagereq>
+ <packagereq type="default">rhnmd</packagereq>
+ <packagereq type="default">rhnsd</packagereq>
+ <packagereq type="default">rhn-check</packagereq>
+ <packagereq type="default">rhn-setup</packagereq>
+ <packagereq type="default">rhn-setup-gnome</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
+ <packagereq type="default">spacewalk-certs-tools</packagereq>
+ <packagereq type="default">spacewalk-backend-libs</packagereq>
+ <packagereq type="default">python-ethtool</packagereq>
+ <packagereq type="default">python-hwdata</packagereq>
+ </packagelist>
+ </group>
+</comps>
13 years, 4 months
proxy/proxy
by Miroslav Suchý
proxy/proxy/pm/uploadLib.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 1be815ce6924621c46ed33c610a46bc2d2aff31c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 2 17:25:11 2010 +0100
656753 - add namespace prefix to merged functions
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index 761df06..4f5fa16 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -76,7 +76,7 @@ class UploadClass(uploadLib.UploadClass):
#self.setServer()
for filename in self.files:
- fileinfo = _processFile(filename,\
+ fileinfo = uploadLib._processFile(filename,\
relativeDir=self.relativeDir, source=self.options.source,\
nosig=self.options.nosig)
self.processPackage(fileinfo['nvrea'], filename)
@@ -125,9 +125,9 @@ class UploadClass(uploadLib.UploadClass):
# Some feedback
if self.options.verbose:
- ReportError("Uploading batch:")
+ uploadLib.ReportError("Uploading batch:")
for p in uploadedPackages.values():
- ReportError("\t\t%s" % p)
+ uploadLib.ReportError("\t\t%s" % p)
if source:
method = self.server.packages.uploadSourcePackageInfo
13 years, 4 months
proxy/proxy
by Miroslav Suchý
proxy/proxy/pm/uploadLib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e08e645c2fc6fcbdebb0d9235bdc9cde29539183
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Thu Dec 2 17:03:26 2010 +0100
656753 - fix TB during rhn_package_manager -v -l
addressing:
Traceback (most recent call last):
File "/usr/bin/rhn_package_manager", line 28, in ?
rhn_package_manager.main()
File "/usr/share/rhn/PackageManager/rhn_package_manager.py", line 95, in main
upload.list()
File "/usr/share/rhn/PackageManager/uploadLib.py", line 38, in list
list = listChannel(self.server, self.username, self.password,
NameError: global name 'listChannel' is not defined
diff --git a/proxy/proxy/pm/uploadLib.py b/proxy/proxy/pm/uploadLib.py
index eceeec9..761df06 100644
--- a/proxy/proxy/pm/uploadLib.py
+++ b/proxy/proxy/pm/uploadLib.py
@@ -35,7 +35,7 @@ class UploadClass(uploadLib.UploadClass):
self.die(1, "Listing source rpms not supported")
else:
# List the channel's contents
- list = listChannel(self.server, self.username, self.password,
+ list = uploadLib.listChannel(self.server, self.username, self.password,
self.channels)
for p in list:
print p[:6]
13 years, 4 months
Changes to 'refs/tags/spacewalk-web-1.3.10-1'
by Lukas Zapletal
Tag 'spacewalk-web-1.3.10-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2010-12-02 09:12 +0000
Tagging package [spacewalk-web] version [1.3.10-1] in directory [web/].
Changes since spacewalk-backend-1.3.20-1:
Lukas Zapletal (2):
658256 - Error 500 - ISE - when scheduling remote commands (proper fix)
Automatic commit of package [spacewalk-web] release [1.3.10-1].
Michael Mraka (1):
fixed column aliases (PG)
Miroslav Suchý (1):
add RHEL6 to builds
---
backend/server/rhnVirtualization.py | 30 +++++++--------
rel-eng/build-missing-builds-in-koji.sh | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 12 +++---
web/spacewalk-web.spec | 5 ++
5 files changed, 27 insertions(+), 24 deletions(-)
---
13 years, 4 months
2 commits - rel-eng/packages web/modules web/spacewalk-web.spec
by Lukas Zapletal
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml | 12 ++++++------
web/spacewalk-web.spec | 5 ++++-
3 files changed, 11 insertions(+), 8 deletions(-)
New commits:
commit 3be84d94420c1479344cdb5a42444b3b3d361805
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Dec 2 10:12:56 2010 +0100
Automatic commit of package [spacewalk-web] release [1.3.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index eed4d8f..7135b60 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.3.9-1 web/
+1.3.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7e9a621..2688960 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.3.9
+Version: 1.3.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Thu Dec 02 2010 Lukas Zapletal 1.3.10-1
+- 658256 - Error 500 - ISE - when scheduling remote commands (proper fix)
+
* Wed Dec 01 2010 Michael Mraka <michael.mraka(a)redhat.com> 1.3.9-1
- Reverted "658256 - Error 500 - ISE - when scheduling remote commands"
commit 3589dbc33ea667fc7e5d17ec5ee8e91eaeb0c8d4
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Dec 2 10:11:26 2010 +0100
658256 - Error 500 - ISE - when scheduling remote commands (proper fix)
Proper fix for reverted commit 01595ed07a3db9bc51a14d74a0b031378c12d3b0
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index d330308..e261064 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1030,15 +1030,15 @@ ORDER BY UPPER(NVL(S.name, '(none)')), S.id
SELECT SERVER_ID AS ID, SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES, SERVER_NAME,
SERVER_ADMINS, GROUP_COUNT, NOTE_COUNT, MODIFIED, CHANNEL_LABELS, CHANNEL_ID, HISTORY_COUNT,
LAST_CHECKIN_DAYS_AGO, PENDING_UPDATES, OS, RELEASE, SERVER_ARCH_NAME, LAST_CHECKIN, LOCKED,
- ( SELECT CASE
+ MONITORING_STATUS.ST AS MONITORING_STATUS,
+ COALESCE((SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = OV.server_id AND SFV.label = 'ftr_system_grouping'), 0) AS SELECTABLE
+ FROM rhnServerOverview OV LEFT OUTER JOIN
+ ( SELECT CP.host_id, CASE
MAX(CASE PS.state WHEN 'OK' THEN 1 WHEN 'PENDING' THEN 2 WHEN 'UNKNOWN' THEN 3 WHEN 'WARNING' THEN 4 WHEN 'CRITICAL' THEN 5 END)
WHEN 1 THEN 'OK' WHEN 2 THEN 'PENDING' WHEN 3 THEN 'UNKNOWN' WHEN 4 THEN 'WARNING' WHEN 5 THEN 'CRITICAL' END ST
- FROM rhn_probe_state PS
- LEFT OUTER JOIN rhn_check_probe CP ON OV.server_id = CP.host_id
+ FROM rhn_check_probe CP, rhn_probe_state PS
WHERE PS.probe_id = CP.probe_id
- GROUP BY OV.server_id ) MONITORING_STATUS,
- COALESCE((SELECT 1 FROM rhnServerFeaturesView SFV WHERE SFV.server_id = OV.server_id AND SFV.label = 'ftr_system_grouping'), 0) AS SELECTABLE
- FROM rhnServerOverview OV
+ GROUP BY CP.host_id ) MONITORING_STATUS ON OV.server_id = MONITORING_STATUS.host_id
WHERE server_id IN (%s)
ORDER BY UPPER(NVL(SERVER_NAME, '(none)')), SERVER_ID
</query>
13 years, 4 months