backend/server/rhnCapability.py | 1
backend/spacewalk-backend.spec | 5 +++-
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 ++++
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 15 ++++++++----
rel-eng/packages/rhn-client-tools | 2 -
rel-eng/packages/spacewalk-backend | 2 -
6 files changed, 23 insertions(+), 8 deletions(-)
New commits:
commit 77b9fcece0377ca1ebfae82cb13c57dfa7c8f48b
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue May 28 17:12:44 2013 -0400
Automatic commit of package [rhn-client-tools] release [1.10.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 0d98d4c..51dba99 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.10.6
+Version: 1.10.7
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -346,6 +346,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Tue May 28 2013 Stephen Herr <sherr(a)redhat.com> 1.10.7-1
+- 948337 - Make client tools only pass up cpu_socket if server has capability
+- man pages branding cleanup + misc branding fixes
+
* Tue May 21 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.6-1
- branding clean-up of rhel client stuff
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 0fff4f5..7c62c42 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.10.6-1 client/rhel/rhn-client-tools/
+1.10.7-1 client/rhel/rhn-client-tools/
commit d1693b29174b0751b1e89e8e49caba1c6fc64c2f
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue May 28 17:12:31 2013 -0400
Automatic commit of package [spacewalk-backend] release [1.10.40-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4f468d9..da4f3a5 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.10.39
+Version: 1.10.40
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue May 28 2013 Stephen Herr <sherr(a)redhat.com> 1.10.40-1
+- 948335 - adding new server client capability for cpu_sockets
+
* Tue May 28 2013 Simon Lukasik <slukasik(a)redhat.com> 1.10.39-1
- Add scap into list of packaged modules.
- Do not use python key-word as a variable name
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 39614f9..37e1131 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.39-1 backend/
+1.10.40-1 backend/
commit 354506ac7dabf00538a5b8332bfddff0fbe3ef7c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue May 28 16:58:08 2013 -0400
948335 - adding new server client capability for cpu_sockets
diff --git a/backend/server/rhnCapability.py b/backend/server/rhnCapability.py
index 3bfd0cc..550f1be 100644
--- a/backend/server/rhnCapability.py
+++ b/backend/server/rhnCapability.py
@@ -168,6 +168,7 @@ def _set_server_capabilities():
'staging_content' : {'version' : 1,
'value' : 1},
'ipv6' : {'version' : 1,
'value' : 1},
'abrt' : {'version' : 1,
'value' : 1},
+ 'cpu_sockets' : {'version' : 1,
'value' : 1},
}
l = []
for name, hashval in capabilities.items():
commit e0210e92c2b41c071f7b6361b80ba0ae7cda87f0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Tue May 28 16:57:26 2013 -0400
948337 - Make client tools only pass up cpu_socket if server has capability
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 2b9e5ba..69a9670 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -21,6 +21,7 @@ import re
import os
import sys
import config
+import rhnserver
try:
import ethtool
@@ -400,10 +401,16 @@ def read_cpuinfo():
if hwdict["count"] == 0: # we have at least one
hwdict["count"] = 1
- # If we know it add in the number of sockets
- number_sockets = __get_number_sockets()
- if number_sockets:
- hwdict['socket_count'] = number_sockets
+ # Network communication doesn't really belong in here. Sadly though
+ # this is the only single place we can put this check. If it's not
+ # here then it would need to be in five or six other places, which
+ # is not good from a DRY and quality-assurance perspective.
+ s = rhnserver.RhnServer()
+ if s.capabilities.hasCapability('cpu_sockets'):
+ # If we know it add in the number of sockets
+ number_sockets = __get_number_sockets()
+ if number_sockets:
+ hwdict['socket_count'] = number_sockets
# This whole things hurts a lot.
return hwdict