backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 562d4265e77b458160f1b36183b97d42b1ecceee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:48:27 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index d94767d..eabfc31 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.12
+Version: 1.9.13
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Dec 10 2012 Jan Pazdziora 1.9.13-1
+- 885170 - fixing syntax.
+
* Mon Dec 10 2012 Jan Pazdziora 1.9.12-1
- 885170 - provide translations of a new error recieved from Hosted
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3eaf6ae..6f9a9de 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.12-1 backend/
+1.9.13-1 backend/
11 years, 4 months
backend/common
by Jan Pazdziora
backend/common/rhnException.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit bf8ad23de280742d707cd54f9ff65ad40e153ad0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:47:50 2012 +0100
885170 - fixing syntax.
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index 69ed470..d2829fe 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -192,7 +192,7 @@ on this system."),
"""),
72: _("""You can not unsubscribe from base channel."""),
73: _("""Satellite or Proxy channel can not be subscribed."""),
- 74: _("") # not used, reserved for Hosted-only RegistrationDenied error.
+ 74: _(""), # not used, reserved for Hosted-only RegistrationDenied error.
# 80-90: server group errors
80: _("There was an error while trying to join the system to its groups"),
11 years, 4 months
Changes to 'refs/tags/spacewalk-backend-1.9.12-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.9.12-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-10 09:33 +0000
Tagging package [spacewalk-backend] version [1.9.12-1] in directory [backend/].
Changes since rhn-client-tools-1.9.7-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-backend] release [1.9.12-1].
---
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
11 years, 4 months
Changes to 'refs/tags/rhn-client-tools-1.9.7-1'
by Jan Pazdziora
Tag 'rhn-client-tools-1.9.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-10 09:33 +0000
Tagging package [rhn-client-tools] version [1.9.7-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-admin-1.9.3-1:
Jan Pazdziora (1):
Automatic commit of package [rhn-client-tools] release [1.9.7-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
---
11 years, 4 months
2 commits - backend/spacewalk-backend.spec client/rhel rel-eng/packages
by Jan Pazdziora
backend/spacewalk-backend.spec | 5 ++++-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
rel-eng/packages/spacewalk-backend | 2 +-
4 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 46a56a3ab8751230b3f12cb0113143a417ebcaa7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:33:41 2012 +0100
Automatic commit of package [spacewalk-backend] release [1.9.12-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 7dd69fc..d94767d 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.9.11
+Version: 1.9.12
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -637,6 +637,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Mon Dec 10 2012 Jan Pazdziora 1.9.12-1
+- 885170 - provide translations of a new error recieved from Hosted
+
* Tue Dec 04 2012 Jan Pazdziora 1.9.11-1
- On Fedoras, start to use tomcat >= 7.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index f2a9bbb..3eaf6ae 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.9.11-1 backend/
+1.9.12-1 backend/
commit 808707d826c4eee0f6e71b76884158d1d17f359b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:33:32 2012 +0100
Automatic commit of package [rhn-client-tools] release [1.9.7-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index d080843..0a1bd91 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.9.6
+Version: 1.9.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Mon Dec 10 2012 Jan Pazdziora 1.9.7-1
+- 885170 - provide translations of a new error recieved from Hosted
+- 882174 - read the hostname from /etc/hostname if needed
+
* Fri Nov 30 2012 Jan Pazdziora 1.9.6-1
- 876740 - fix typo
- 876740 - server url auto-corrects common mistakes, messages say "Satellite"
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 3e4c3bf7..5a2740a 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.9.6-1 client/rhel/rhn-client-tools/
+1.9.7-1 client/rhel/rhn-client-tools/
11 years, 4 months
Changes to 'refs/tags/spacewalk-admin-1.9.3-1'
by Jan Pazdziora
Tag 'spacewalk-admin-1.9.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-12-10 09:33 +0000
Tagging package [spacewalk-admin] version [1.9.3-1] in directory [spacewalk/admin/].
Changes since spacewalk-java-1.9.28-1:
Jan Pazdziora (5):
Subpackages cobbler-web and koan are built from cobbler20 but we do not want to ship them.
Fixing typo.
Move spacewalk-java-tests from the no-install group.
The systemd service files are not executable, using -e.
Automatic commit of package [spacewalk-admin] release [1.9.3-1].
Milan Zazrivec (1):
882174 - read the hostname from /etc/hostname if needed
Stephen Herr (1):
885170 - provide translations of a new error recieved from Hosted
---
backend/common/rhnException.py | 3
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 +++-
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 +
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 10 +-
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 35 +++++++---
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 6 +
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 4 -
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 6 +
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 6 +
rel-eng/packages/spacewalk-admin | 2
spacewalk/admin/spacewalk-admin.spec | 5 +
spacewalk/admin/spacewalk-service | 4 -
13 files changed, 74 insertions(+), 28 deletions(-)
---
11 years, 4 months
2 commits - rel-eng/packages spacewalk/admin
by Jan Pazdziora
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 5 ++++-
spacewalk/admin/spacewalk-service | 4 ++--
3 files changed, 7 insertions(+), 4 deletions(-)
New commits:
commit 8259aedddda508dc0c2e23645223f4dc1361fc95
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:33:01 2012 +0100
Automatic commit of package [spacewalk-admin] release [1.9.3-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index eb78fd6..67d328d 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.9.2-1 spacewalk/admin/
+1.9.3-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 4882b2b..cc6c0ce 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.9.2
+Version: 1.9.3
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -75,6 +75,9 @@ rm -rf $RPM_BUILD_ROOT
%config(noreplace) %{_sysconfdir}/rhn/service-list
%changelog
+* Mon Dec 10 2012 Jan Pazdziora 1.9.3-1
+- The systemd service files are not executable, using -e.
+
* Fri Dec 07 2012 Jan Pazdziora 1.9.2-1
- Fixing typo.
commit 0c2097be86d95434e46ccd0f890096eaecb595af
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 10 10:32:11 2012 +0100
The systemd service files are not executable, using -e.
diff --git a/spacewalk/admin/spacewalk-service b/spacewalk/admin/spacewalk-service
index 1f4a491..bf4aa90 100755
--- a/spacewalk/admin/spacewalk-service
+++ b/spacewalk/admin/spacewalk-service
@@ -28,11 +28,11 @@ if [ -x /etc/init.d/tomcat5 ]; then
TOMCAT="tomcat5"
fi
-if [ -x /etc/init.d/tomcat6 -o -x /lib/systemd/system/tomcat6.service ]; then
+if [ -x /etc/init.d/tomcat6 -o -e /lib/systemd/system/tomcat6.service ]; then
TOMCAT="tomcat6"
fi
-if [ -x /lib/systemd/system/tomcat.service ]; then
+if [ -e /lib/systemd/system/tomcat.service ]; then
TOMCAT="tomcat"
fi
11 years, 4 months
backend/common client/rhel
by StephenHerr
backend/common/rhnException.py | 3
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 4 +
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 10 +-
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 3
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 35 +++++++---
5 files changed, 41 insertions(+), 14 deletions(-)
New commits:
commit 3856179a57bd4a237cc6221a03ce59e0d159df06
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri Dec 7 14:35:01 2012 -0500
885170 - provide translations of a new error recieved from Hosted
diff --git a/backend/common/rhnException.py b/backend/common/rhnException.py
index b8c6f61..69ed470 100644
--- a/backend/common/rhnException.py
+++ b/backend/common/rhnException.py
@@ -167,7 +167,7 @@ on this system."),
does not already exists on the server
"""),
55: _("""
- The --force rhnpush option is disabled on this server.
+ The --force rhnpush option is disabled on this server.
Please contact your Satellite administrator for more help.
"""),
@@ -192,6 +192,7 @@ on this system."),
"""),
72: _("""You can not unsubscribe from base channel."""),
73: _("""Satellite or Proxy channel can not be subscribed."""),
+ 74: _("") # not used, reserved for Hosted-only RegistrationDenied error.
# 80-90: server group errors
80: _("There was an error while trying to join the system to its groups"),
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 3dc260e..bbb8449 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -293,6 +293,7 @@ class ChooseServerPage:
# If they changed the value, write it back to the config file.
if customServer != self.server:
config.setServerURL(customServer)
+ self.server = customServer
if not cfg['sslCACert']:
up2dateConfig.set('sslCACert',
'/usr/share/rhn/RHN-ORG-TRUSTED-SSL-CERT')
@@ -730,6 +731,9 @@ class CreateProfilePage:
except up2dateErrors.InsuffMgmntEntsError, e:
pwin.hide()
self.fatalError(_("Problem registering system:\n") + e.errmsg)
+ except up2dateErrors.RegistrationDeniedError, e:
+ pwin.hide()
+ self.fatalError(_("Problem registering system:\n") + e.errmsg)
except up2dateErrors.InvalidProductRegistrationError, e:
pwin.hide()
errorWindow(_("The installation number [ %s ] provided is not a valid installation number. Please go back to the previous screen and fix it." %
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
index 671b96b..eb6553d 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -45,7 +45,7 @@ class _DoCallWrapper(object):
A callable object that will handle multiple levels of attributes,
and catch exceptions.
"""
-
+
def __init__(self, server, method_name):
self._server = server
self._method_name = method_name
@@ -80,7 +80,7 @@ class _DoCallWrapper(object):
raise up2dateErrors.SSLCertificateVerifyFailedError(), None, sys.exc_info()[2]
else:
raise up2dateErrors.NetworkError(message), None, sys.exc_info()[2]
-
+
def __exception_from_fault(self, fault):
if fault.faultCode == -3:
# This username is already taken, or the password is incorrect.
@@ -118,6 +118,8 @@ class _DoCallWrapper(object):
exception = up2dateErrors.AbuseError(fault.faultString)
elif abs(fault.faultCode) == 60:
exception = up2dateErrors.AuthenticationTicketError(fault.faultString)
+ elif abs(fault.faultCode) == 74:
+ exception = up2dateErrors.RegistrationDeniedError()
elif abs(fault.faultCode) == 105:
exception = up2dateErrors.RhnUuidUniquenessError(fault.faultString)
elif fault.faultCode == 99:
@@ -156,8 +158,8 @@ class _DoCallWrapper(object):
class RhnServer(object):
- """
- An rpc server object that calls doCall for you, and catches lower
+ """
+ An rpc server object that calls doCall for you, and catches lower
level exceptions
"""
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index fd7d6ac..9429998 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -989,6 +989,9 @@ class SendingWindow:
except up2dateErrors.InsuffMgmntEntsError, e:
FatalErrorWindow(self.screen,
_("Problem registering system:\n") + e.errmsg)
+ except up2dateErrors.RegistrationDeniedError, e:
+ FatalErrorWindow(self.screen,
+ _("Problem registering system:\n") + e.errmsg)
except up2dateErrors.ActivationKeyUsageLimitError, e:
FatalErrorWindow(self.screen,
ACT_KEY_USAGE_LIMIT_ERROR)
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 39174a4..1dd32d3 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -170,10 +170,27 @@ class ValidationError(NoLogError, RhnServerException):
class InvalidRegistrationNumberError(ValidationError):
pass
+class RegistrationDeniedError(RhnServerException):
+ def __init__(self):
+ RhnServerException.__init__(self, self.changeExplanation())
+
+ def __repr__(self):
+ return self.value
+
+ def changeExplanation(self):
+ return _("""
+Red Hat Network Classic is not supported.
+To register with Red Hat Subscription Management please run:
+
+ subscription-manager register --auto-attach
+
+Get more information at access.redhat.com/knowledge
+ """)
+
class InvalidProductRegistrationError(NoLogError):
"""indicates an error during server input validation"""
premsg = _("The installation number is invalid")
-
+
class OemInfoFileError(NoLogError):
premsg = _("Error parsing the oemInfo file at field:\n")
@@ -228,15 +245,15 @@ class SSLCertificateFileNotFound(Error):
class AuthenticationOrAccountCreationError(ValidationError):
"""Class that can represent different things depending on context:
- While logging in with an existing user it represents a username or password
+ While logging in with an existing user it represents a username or password
being incorrect.
- While creating a new account, it represents the username already being
+ While creating a new account, it represents the username already being
taken or the user not being allowed to create an account.
Optimally these different things would be different exceptions, but there
are single fault codes the server can return to the client that can mean
- more than one of them so we have no way of knowing which is actually
+ more than one of them so we have no way of knowing which is actually
intended.
-
+
"""
pass
@@ -272,19 +289,19 @@ class InsuffMgmntEntsError(RhnServerException):
def changeExplanation(self, msg):
newExpln = _("""
Your organization does not have enough Management entitlements to register this
- system to Red Hat Network. Please notify your organization administrator of this error.
- You should be able to register this system after your organization frees existing
+ system to Red Hat Network. Please notify your organization administrator of this error.
+ You should be able to register this system after your organization frees existing
or purchases additional entitlements. Additional entitlements may be purchased by your
organization administrator by logging into Red Hat Network and visiting
the 'Subscription Management' page in the 'Your RHN' section of RHN.
-
+
A common cause of this error code is due to having mistakenly setup an
Activation Key which is set as the universal default. If an activation key is set
on the account as a universal default, you can disable this key and retry to avoid
requiring a Management entitlement.""")
term = "Explanation:"
loc = msg.rindex(term) + len(term)
- return msg[:loc] + newExpln
+ return msg[:loc] + newExpln
class NoSystemIdError(NoLogError):
pass
11 years, 4 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 14 +++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
New commits:
commit 54051af0f52cccac8823495e8e3b27029532f97a
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Dec 7 17:12:38 2012 +0100
882174 - read the hostname from /etc/hostname if needed
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 41856e4..97ba6b6 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -449,11 +449,19 @@ def findHostByRoute():
s.close()
continue
s.close()
-
+
+ # Override hostname with the value from /etc/hostname
+ if os.path.isfile("/etc/hostname") and os.access("/etc/hostname", os.R_OK):
+ hostnameinfo = open("/etc/hostname", "r").readlines()
+
+ for info in hostnameinfo:
+ if not len(info):
+ continue
+ hostname = info.strip()
+
# Override hostname with the one in /etc/sysconfig/network
# for bz# 457953
-
- if os.path.isfile("/etc/sysconfig/network") and os.access("/etc/sysconfig/network", os.R_OK):
+ elif os.path.isfile("/etc/sysconfig/network") and os.access("/etc/sysconfig/network", os.R_OK):
networkinfo = open("/etc/sysconfig/network", "r").readlines()
for info in networkinfo:
11 years, 4 months
rel-eng/comps
by Jan Pazdziora
rel-eng/comps/comps-spacewalk-server-fedora16.xml | 2 +-
rel-eng/comps/comps-spacewalk-server-fedora17.xml | 2 +-
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 2 +-
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit ba5475fa8b735dfba12aeca2ab1e2da6c9241f7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 7 11:07:43 2012 +0100
Move spacewalk-java-tests from the no-install group.
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora16.xml b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
index 8eb0a8b..3ce3ba9 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora16.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora16.xml
@@ -107,6 +107,7 @@
<packagereq type="default">spacewalk-java-lib</packagereq>
<packagereq type="default">spacewalk-java-oracle</packagereq>
<packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="optional">spacewalk-java-tests</packagereq>
<packagereq type="default">spacewalk-jpp-workaround</packagereq>
<packagereq type="default">spacewalk-monitoring</packagereq>
<packagereq type="default">spacewalk-monitoring-selinux</packagereq>
@@ -167,7 +168,6 @@
<packagelist>
<packagereq type="optional">cobbler-web</packagereq>
<packagereq type="optional">koan</packagereq>
- <packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora17.xml b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
index 8eb0a8b..3ce3ba9 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora17.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora17.xml
@@ -107,6 +107,7 @@
<packagereq type="default">spacewalk-java-lib</packagereq>
<packagereq type="default">spacewalk-java-oracle</packagereq>
<packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="optional">spacewalk-java-tests</packagereq>
<packagereq type="default">spacewalk-jpp-workaround</packagereq>
<packagereq type="default">spacewalk-monitoring</packagereq>
<packagereq type="default">spacewalk-monitoring-selinux</packagereq>
@@ -167,7 +168,6 @@
<packagelist>
<packagereq type="optional">cobbler-web</packagereq>
<packagereq type="optional">koan</packagereq>
- <packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 4420431..92e199a 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -149,6 +149,7 @@
<packagereq type="default">spacewalk-java-lib</packagereq>
<packagereq type="default">spacewalk-java-oracle</packagereq>
<packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="optional">spacewalk-java-tests</packagereq>
<packagereq type="default">spacewalk-monitoring</packagereq>
<packagereq type="default">spacewalk-monitoring-selinux</packagereq>
<packagereq type="default">spacewalk-oracle</packagereq>
@@ -240,7 +241,6 @@
<packagelist>
<packagereq type="optional">cobbler-web</packagereq>
<packagereq type="optional">koan</packagereq>
- <packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
</comps>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index e728b08..8239386 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -109,6 +109,7 @@
<packagereq type="default">spacewalk-java-lib</packagereq>
<packagereq type="default">spacewalk-java-oracle</packagereq>
<packagereq type="default">spacewalk-java-postgresql</packagereq>
+ <packagereq type="optional">spacewalk-java-tests</packagereq>
<packagereq type="default">spacewalk-jpp-workaround</packagereq>
<packagereq type="default">spacewalk-monitoring</packagereq>
<packagereq type="default">spacewalk-monitoring-selinux</packagereq>
@@ -170,7 +171,6 @@
<packagelist>
<packagereq type="optional">cobbler-web</packagereq>
<packagereq type="optional">koan</packagereq>
- <packagereq type="optional">spacewalk-java-tests</packagereq>
</packagelist>
</group>
</comps>
11 years, 4 months