web/modules
by Jan Pazdziora
web/modules/rhn/RHN/Access/User.pm | 42 -------------------------------------
1 file changed, 42 deletions(-)
New commits:
commit 27d12dcca8f43b93281d0c6622fe263b164e26ba
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 3 16:36:38 2011 +0100
RHN::Access::User not used anywhere, removing.
diff --git a/web/modules/rhn/RHN/Access/User.pm b/web/modules/rhn/RHN/Access/User.pm
deleted file mode 100644
index 59b1458..0000000
--- a/web/modules/rhn/RHN/Access/User.pm
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# 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.
-#
-
-package RHN::Access::User;
-
-use strict;
-use PXT::ACL;
-use RHN::User ();
-
-sub register_acl_handlers {
- my $self = shift;
- my $acl = shift;
-
- $acl->register_handler(uid_role => \&uid_role_acl_test);
-}
-
-sub uid_role_acl_test {
- my $pxt = shift;
- my $role = shift;
-
-
- my $uid = $pxt->param('uid');
- die "uid_role_acl_test called without user id" unless $uid;
- my $user = RHN::User->lookup(-id => $uid);
-
- die "uid_role_acl_test called with no user found for id" unless $user;
- return $user->is($role) ? 1 : 0;
-}
-
-1;
13 years, 3 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/updatePackages.py | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 253bab4bfd72c3674eb438468a14df0226cf11b2
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 3 16:22:12 2011 +0100
655207 - exit after unsuccessful rpm header read
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index c92394b..52e3a9e 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -192,6 +192,7 @@ def process_package_data():
if debug:
Log.writeMessage(msg)
rhnSQL.commit()
+ sys.exit(1)
if old_abs_path != new_abs_path:
new_abs_dir = os.path.dirname(new_abs_path)
13 years, 3 months
Changes to 'refs/tags/rhncfg-5.9.41-1'
by Miroslav Suchý
Tag 'rhncfg-5.9.41-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-01-03 15:19 +0000
Tagging package [rhncfg] version [5.9.41-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-backend-1.3.36-1:
Jan Pazdziora (1):
Updating the copyright years to include 2010.
Michael Mraka (2):
added overall usage summary and flex guest entitlement details to rhn-entitlement-report
hide cleartext password from traceback
Milan Zazrivec (1):
655207 - print the exception details into stdout
Miroslav Suchý (5):
send with config file, its modified time
do diff directly in memory
do not fail if diff do not differ
634963 - indicate change in selinux, ownership or file mode (even if diff is empty)
Automatic commit of package [rhncfg] release [5.9.41-1].
Simon Lukasik (1):
Correct the Filename tag in Packages.gz
Tomas Lestach (1):
display also error parameters when throwing InvalidKickstartTreeException
---
backend/common/UserDictCase.py | 2
backend/satellite_tools/rhn-entitlement-report | 38 +++++--
backend/satellite_tools/updatePackages.py | 7 -
backend/server/configFilesHandler.py | 6 +
backend/server/handlers/sat/__init__.py | 2
backend/server/rhnSQL/__init__.py | 3
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 2
client/rhel/rhnlib/rhn/SSL.py | 2
client/rhel/rhnlib/rhn/SmartIO.py | 2
client/solaris/rhnclient/rhn/client/rhnReg.py | 2
client/solaris/rhnclient/rhn/rhn_check.py | 2
client/solaris/rhnclient/rhn_check.py | 2
client/tools/action-rpms/rhn-applet-actions/rhn_applet.py | 2
client/tools/osad/src/osad.py | 2
client/tools/osad/src/osad_client.py | 2
client/tools/osad/test/simple-client.py | 2
client/tools/osad/test/simple-dispatcher.py | 2
client/tools/rhn-virtualization/virtualization/domain_control.py | 2
client/tools/rhn-virtualization/virtualization/schedule_poller.py | 2
client/tools/rhncfg/actions/ModeController.py | 2
client/tools/rhncfg/actions/ModeControllerCreator.py | 2
client/tools/rhncfg/actions/rhn-actions-control.py | 2
client/tools/rhncfg/config_client/rhncfgcli_channels.py | 2
client/tools/rhncfg/config_client/rhncfgcli_get.py | 2
client/tools/rhncfg/config_common/rhn_main.py | 2
client/tools/rhncfg/config_common/rhn_rpc.py | 2
client/tools/rhncfg/config_common/rpc_wrapper.py | 2
client/tools/rhncfg/config_management/rhncfg_add.py | 2
client/tools/rhncfg/config_management/rhncfg_diff.py | 51 +++++++---
client/tools/rhncfg/config_management/rhncfg_diff_revisions.py | 2
client/tools/rhncfg/config_management/rhncfg_remove.py | 2
client/tools/rhncfg/config_management/rpc_repository.py | 2
client/tools/rhncfg/rhncfg.spec | 9 +
client/tools/rhncfg/test/test_action_deploy.py | 2
client/tools/rhncfg/test/test_action_diff.py | 2
client/tools/rhncustominfo/rhn-custom-info.py | 2
client/tools/rhnpush/rhnpush_cache.py | 2
client/tools/rhnpush/rhnpush_v2.py | 2
client/tools/rhnpush/test/testRhnpushConfig.py | 2
client/tools/rhnpush/test/testUtils.py | 2
client/tools/rhnpush/test/test_archive.py | 2
client/tools/rhnpush/utils.py | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java | 10 +
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/DebPackageWriter.java | 8 -
proxy/installer/rhn_proxy_activate.py | 2
proxy/proxy/rhnAuthProtocol.py | 2
rel-eng/packages/rhncfg | 2
schema/spacewalk/postgres/packages/rhn_config.pkb | 2
schema/spacewalk/postgres/packages/rhn_config.pks | 2
schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql | 2
schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql | 2
spacewalk/certs-tools/rhn_bootstrap_strings.py | 2
spacewalk/certs-tools/sslToolCli.py | 2
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 2
web/modules/dobby/Dobby/CLI/MaintCommands.pm | 2
web/modules/rhn/RHN/DB/ContactMethod.pm | 2
57 files changed, 153 insertions(+), 77 deletions(-)
---
13 years, 3 months
client/tools rel-eng/packages
by Miroslav Suchý
client/tools/rhncfg/rhncfg.spec | 9 ++++++++-
rel-eng/packages/rhncfg | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 9332da9426bca7bee0654c3ac748f37716f6f79b
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 3 16:19:32 2011 +0100
Automatic commit of package [rhncfg] release [5.9.41-1].
diff --git a/client/tools/rhncfg/rhncfg.spec b/client/tools/rhncfg/rhncfg.spec
index caa0bb7..a7532ea 100644
--- a/client/tools/rhncfg/rhncfg.spec
+++ b/client/tools/rhncfg/rhncfg.spec
@@ -8,7 +8,7 @@ Group: Applications/System
License: GPLv2 and Python
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.40
+Version: 5.9.41
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -100,6 +100,13 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Jan 03 2011 Miroslav Suchý <msuchy(a)redhat.com> 5.9.41-1
+- 634963 - indicate change in selinux, ownership or file mode (even if diff is
+ empty)
+- do not fail if diff do not differ
+- do diff directly in memory
+- Updating the copyright years to include 2010. (jpazdziora(a)redhat.com)
+
* Thu Dec 23 2010 Jan Pazdziora 5.9.40-1
- make _make_stat_info public method (msuchy(a)redhat.com)
- create new function get_raw_file_info for case, when we do not need file on
diff --git a/rel-eng/packages/rhncfg b/rel-eng/packages/rhncfg
index b8e9090..cd73fe2 100644
--- a/rel-eng/packages/rhncfg
+++ b/rel-eng/packages/rhncfg
@@ -1 +1 @@
-5.9.40-1 client/tools/rhncfg/
+5.9.41-1 client/tools/rhncfg/
13 years, 3 months
4 commits - backend/server client/tools
by Miroslav Suchý
backend/server/configFilesHandler.py | 6 ++
client/tools/rhncfg/config_management/rhncfg_diff.py | 51 ++++++++++++++-----
2 files changed, 45 insertions(+), 12 deletions(-)
New commits:
commit 46f7967afb14981095af1621d7d735c6d02d0c42
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 3 15:14:13 2011 +0100
634963 - indicate change in selinux, ownership or file mode (even if diff is empty)
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 87de1d4..d4fafb1 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -103,6 +103,13 @@ class Handler(handler_base.HandlerBase):
sys.stdout.write(
self.diff_file(channel, remote_file, local_file, revision))
+ def __attributes_differ(self, fsrc, fdst):
+ """ Returns true if acl, ownership, type or selinux context differ.
+ fsrc is config file retrieved from xmlrpc, fdst is output of make_stat_info()
+ """
+ return (fsrc['filemode'] != fdst['mode']) or \
+ (fsrc['username'] != fdst['user']) or (fsrc['groupname'] != fdst['group']) or \
+ (fsrc['selinux_ctx'] != fdst['selinux_ctx'])
def diff_file(self, channel, path, local_file, revision):
r = self.repository
@@ -137,7 +144,7 @@ class Handler(handler_base.HandlerBase):
pass
file_stat = os.lstat(local_file)
local_info = r.make_stat_info(local_file, file_stat)
- if not first_row:
+ if not first_row and not self.__attributes_differ(info, local_info)
return ""
else:
template = "--- %s\t%s\tattributes: %s %s %s %s\tconfig channel: %s\trevision: %s"
commit 3f70bb8be722ef230b75d8ef40c1399362f6e7e0
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 3 14:57:30 2011 +0100
do not fail if diff do not differ
addressing:
Traceback (most recent call last):
File "/usr/bin/rhncfg-manager", line 46, in ?
sys.exit(Main().main() or 0)
File "/usr/share/rhn/config_common/rhn_main.py", line 187, in main
handler.run()
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 103, in run
sys.stdout.write(
File "/usr/share/rhn/config_management/rhncfg_diff.py", line 134, in diff_file
first_row = diff.next()
StopIteration
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index 9bf4fe2..87de1d4 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -129,8 +129,12 @@ class Handler(handler_base.HandlerBase):
fromlines = info['file_contents'].splitlines(1)
tolines = open(local_file, 'r').readlines()
diff_output = difflib.unified_diff(fromlines, tolines, info['path'], local_file)
- first_row = diff_output.next()
- second_row = diff_output.next()
+ first_row = second_row = ''
+ try:
+ first_row = diff_output.next()
+ second_row = diff_output.next()
+ except StopIteration:
+ pass
file_stat = os.lstat(local_file)
local_info = r.make_stat_info(local_file, file_stat)
if not first_row:
commit ec168cb800568729a58104979dd39624ef1d7971
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 3 14:48:54 2011 +0100
do diff directly in memory
current workflow is:
get from xmlrpclib, save to disk, read from disk, do diff.
Saving to disk is really not needed
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index fa0a75e..9bf4fe2 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -13,12 +13,15 @@
# in this software or its documentation.
#
+import base64
+from datetime import datetime
+import difflib
import os
import sys
from config_common import handler_base, utils, cfg_exceptions
from config_common.rhn_log import log_debug, die
-from config_common.file_utils import diff
+from config_common.file_utils import diff, f_date, ostr_to_sym
class Handler(handler_base.HandlerBase):
_usage_options = "[options] file [ file ... ]"
@@ -104,8 +107,12 @@ class Handler(handler_base.HandlerBase):
def diff_file(self, channel, path, local_file, revision):
r = self.repository
try:
- #5/11/05 wregglej - 157066 dirs_created is returned by get_file_info, now.
- temp_file, info, dirs_created = r.get_file_info(channel, path, revision=revision)
+ info = r.get_raw_file_info(channel, path, revision)
+ if info.has_key('encoding') and info['file_contents']:
+ if info['encoding'] == 'base64':
+ info['file_contents'] = base64.decodestring(info['file_contents'])
+ else:
+ die(9, 'Error: unknow encoding %s' % info['encoding'])
except cfg_exceptions.RepositoryFileMissingError:
die(2, "Error: no such file %s (revision %s) in config channel %s"
% (path, revision, channel))
@@ -118,14 +125,23 @@ class Handler(handler_base.HandlerBase):
dest_link = os.readlink(local_file)
if src_link != os.readlink(local_file):
return "Symbolic links differ. Channel: '%s' -> '%s' System: '%s' -> '%s' \n " % (path,src_link, path, dest_link)
- return ""
- diff_u = diff(temp_file, local_file)
-
- diff_len = len(diff_u)
- if diff_len == 0:
return ""
- elif diff_u[0].startswith("---"):
- diff_u[0] = "--- %s\tconfig_channel: %s\trevision: %s\n" % (
- path, channel, info['revision']
+ fromlines = info['file_contents'].splitlines(1)
+ tolines = open(local_file, 'r').readlines()
+ diff_output = difflib.unified_diff(fromlines, tolines, info['path'], local_file)
+ first_row = diff_output.next()
+ second_row = diff_output.next()
+ file_stat = os.lstat(local_file)
+ local_info = r.make_stat_info(local_file, file_stat)
+ if not first_row:
+ return ""
+ else:
+ template = "--- %s\t%s\tattributes: %s %s %s %s\tconfig channel: %s\trevision: %s"
+ first_row = template % (path, str(info['modified']), ostr_to_sym(info['filemode'], info['filetype']),
+ info['username'], info['groupname'], info['selinux_ctx'], channel,
+ info['revision'],
+ )
+ second_row = template % (local_file, f_date(datetime.fromtimestamp(local_info['mtime'])), ostr_to_sym(local_info['mode'], 'file'),
+ local_info['user'], local_info['group'], local_info['selinux_ctx'], 'local file', None
)
- return ''.join(diff_u)
+ return first_row + '\n' + second_row + '\n' + ''.join(list(diff_output))
commit 5a29f20605409ad19f430f736bbc73a962fe1027
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Jan 3 14:14:04 2011 +0100
send with config file, its modified time
one may wonder, why I used that str() function? I will tell you:
That is because of RHEL5 and its python 2.4, where has xmlrpclib.DateTime nearly 0 functionality.
diff --git a/backend/server/configFilesHandler.py b/backend/server/configFilesHandler.py
index c79751a..6497811 100644
--- a/backend/server/configFilesHandler.py
+++ b/backend/server/configFilesHandler.py
@@ -18,6 +18,7 @@
import base64
import os
+import xmlrpclib
from spacewalk.common import rhnFault, rhnException, log_debug, CFG, rhnFlags
from spacewalk.common.checksum import getStringChecksum
@@ -531,6 +532,10 @@ def format_file_results(row, server=None):
if client_caps and client_caps.has_key('configfiles.base64_enc'):
encoding = 'base64'
contents = base64.encodestring(contents)
+ if row['modified']:
+ m_date = xmlrpclib.DateTime(str(row['modified']))
+ else:
+ m_date = ''
return {
'path' : row['path'],
@@ -548,4 +553,5 @@ def format_file_results(row, server=None):
'encoding' : encoding or '',
'filetype' : row['label'],
'selinux_ctx' : row['selinux_ctx'] or '',
+ 'modified' : m_date,
}
13 years, 3 months
backend/satellite_tools
by Milan Zazrivec
backend/satellite_tools/updatePackages.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 8253a75b97c3fae372d39ac86b93bc1166e163e6
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jan 3 14:58:35 2011 +0100
655207 - print the exception details into stdout
diff --git a/backend/satellite_tools/updatePackages.py b/backend/satellite_tools/updatePackages.py
index 21b1c2c..c92394b 100644
--- a/backend/satellite_tools/updatePackages.py
+++ b/backend/satellite_tools/updatePackages.py
@@ -186,11 +186,12 @@ def process_package_data():
try:
hdr = rhn_rpm.get_package_header(filename=old_abs_path)
except Exception, e:
+ msg = "Exception occurred when reading package header %s: %s" % \
+ (old_abs_path, str(e))
+ print msg
if debug:
- Log.writeMessage("Exception occurred when reading package header %s: %s" % \
- (old_abs_path, str(e)))
+ Log.writeMessage(msg)
rhnSQL.commit()
- raise
if old_abs_path != new_abs_path:
new_abs_dir = os.path.dirname(new_abs_path)
13 years, 3 months
backend/server
by Michael Mraka
backend/server/rhnSQL/__init__.py | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit cf722531cf89fb6f1c04b63f0dcb3ae4190e0df6
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 3 13:34:46 2011 +0100
hide cleartext password from traceback
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index ebc0880..29fd23f 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -94,6 +94,7 @@ def initDB(dsn=None, backend=None, host="localhost", port=None, username=None,
# the code in a uniform fashion for all database backends:
(username, temp) = dsn.split("/")
(password, database) = temp.split("@")
+ del temp
if backend == POSTGRESQL:
host = None
@@ -101,6 +102,7 @@ def initDB(dsn=None, backend=None, host="localhost", port=None, username=None,
dsn = CFG.DEFAULT_DB
(username, temp) = dsn.split("/")
(password, dsn) = temp.split("@")
+ del temp
for i in dsn.split(';'):
(k, v) = i.split('=')
if k == 'dbname':
@@ -114,6 +116,7 @@ def initDB(dsn=None, backend=None, host="localhost", port=None, username=None,
# Hide the password
add_to_seclist(dsn)
+ add_to_seclist(password)
try:
__init__DB(backend, host, port, username, password, database)
# except (rhnException, SQLError):
13 years, 3 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java | 10 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
New commits:
commit 5da57f172b1648b495ef872ea01244a82e7d8af9
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jan 3 11:30:00 2011 +0100
display also error parameters when throwing InvalidKickstartTreeException
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java
index 117a812..a30205e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/InvalidKickstartTreeException.java
@@ -32,4 +32,14 @@ public class InvalidKickstartTreeException extends FaultException {
super(2757, "invalidKickstartLabel" , LocalizationService.getInstance().
getMessage(msgKey));
}
+
+ /**
+ * Constructor
+ * @param msgKey of error message
+ * @param msgValues of error message
+ */
+ public InvalidKickstartTreeException(String msgKey, Object[] msgValues) {
+ super(2757, "invalidKickstartLabel" , LocalizationService.getInstance().
+ getMessage(msgKey, msgValues));
+ }
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
index 64d2246..7812feb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/tree/KickstartTreeHandler.java
@@ -138,7 +138,7 @@ public class KickstartTreeHandler extends BaseHandler {
create.setLabel(treeLabel);
ValidatorError ve = create.store();
if (ve != null) {
- throw new InvalidKickstartTreeException(ve.getKey());
+ throw new InvalidKickstartTreeException(ve.getKey(), ve.getValues());
}
return 1;
}
13 years, 3 months
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/rhn-entitlement-report | 38 +++++++++++++++++++------
1 file changed, 29 insertions(+), 9 deletions(-)
New commits:
commit a2b5ecb7a156d6ab5290a1c8e038d72a4f98e475
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jan 3 11:46:24 2011 +0100
added overall usage summary and flex guest entitlement details to rhn-entitlement-report
for more details see
http://www.mail-archive.com/spacewalk-devel@redhat.com/msg02647.html
diff --git a/backend/satellite_tools/rhn-entitlement-report b/backend/satellite_tools/rhn-entitlement-report
index ef94ff8..03146f3 100755
--- a/backend/satellite_tools/rhn-entitlement-report
+++ b/backend/satellite_tools/rhn-entitlement-report
@@ -18,6 +18,7 @@ db_string = CFG.DEFAULT_DB
rhnSQL.initDB(db_string)
def main():
+ printAcrossSatelliteUsage();
list = listOfOrgs()
for org in list:
printOrgHeader(org);
@@ -25,6 +26,25 @@ def main():
printChannelEnts(org['id']);
printOrgFooter()
+def printAcrossSatelliteUsage():
+#This prints summary displayed on https://satellite.fqdn/rhn/admin/multiorg/SystemEntitlements.do and https://satellite.fqdn/rhn/admin/multiorg/SoftwareEntitlements.do which is Channel and Entitlement usage across all organizations
+
+ print ("Software Channel Entitlements Across RHN Satellite :")
+ query = "SELECT cfo.label,SUM(cfo.max_members) as total,SUM(cfo.current_members) as used,(SELECT (cfo2.max_members) - (cfo2.current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available,SUM(cfo.fve_max_members) as total_flex,SUM(cfo.fve_current_members) as used_flex,(SELECT (cfo2.fve_max_members) - (cfo2.fve_current_members) FROM rhnChannelFamilyOverview cfo2 WHERE cfo2.label = cfo.label AND cfo2.org_id = 1) as available_flex FROM rhnChannelFamilyOverview cfo WHERE cfo.max_members is not null and (cfo.current_members !=0 or cfo.fve_current_members!=0) GROUP BY cfo.label, cfo.name HAVING (SUM(cfo.max_members) is not null) ORDER by cfo.name DESC"
+ list = run_query(query)
+ print("%35s %s %s %s %s %s %s" % ("Channel Label"," Total ","Regular Used","Available","Total Flex","Flex Used","Available Flex"))
+ print("%35s %s %s %s %s %s %s" % ("-------------","----------","------------","---------","----------","---------","--------------"))
+
+ for item in list:
+ print("%35s %8s %10s %12s %8s %10s %10s" % (item['label'], str(item['total']),str(item['used']),str(item['available']),str(item['total_flex']),str(item['used_flex']),str(item['available_flex'])))
+
+ print ("\nSystem Entitlements Across RHN Satellite :")
+ query = "SELECT sgt.label as label,SUM(sg.max_members) as total,SUM(sg.current_members) as used,(SELECT (sg2.max_members) - (sg2.current_members) FROM rhnServerGroup sg2 inner join rhnServerGroupType sgt2 on sg2.group_type = sgt2.id WHERE sg2.org_ID = 1 AND sgt2.label = sgt.label) as available FROM rhnServerGroup sg inner join rhnServerGroupType sgt on sgt.id = sg.group_type WHERE sgt.label != 'sw_mgr_entitled' GROUP BY sgt.label, sgt.id ORDER BY sgt.label"
+ print("%35s %s %s %s" % ("System Entitelment"," Total "," Used "," Available "))
+ print("%35s %s %s %s" % ("------------------"," ----- "," ---- "," --------- "))
+ list = run_query(query)
+ for item in list:
+ print("%35s %7s %8s %10s" % (item['label'], str(item['total']),str(item['used']),str(item['available'])))
def printOrgHeader(org):
print("\n")
@@ -38,28 +58,28 @@ def printOrgFooter():
def printChannelEnts(id):
- query = "select CF.label, PCF.current_members from rhnChannelFamily CF inner join rhnPrivateChannelFamily PCF on CF.id = PCF.channel_family_id where PCF.org_id = %d order by CF.label" % (id)
+ query = "SELECT CFO.label, CFO.current_members, CFO.max_members,CFO.fve_current_members as current_flex, CFO.fve_max_members as max_flex,(select count(*) from rhnServerChannel sc inner join rhnChannelFamilyMembers CFM on CFM.channel_id = sc.channel_id where CFM.channel_family_id = CFO.id) as subscribe_count FROM rhnChannelFamilyOverview CFO WHERE CFO.org_id = %d ORDER BY CFO.name ASC" % (id)
list = run_query(query)
- print("%35s %s" % ("Channel Entitelment", "Used"))
- print("%35s %s" % ("-------------------", "----"))
+ print("%35s %s %s %s %s %s" % ("Channel Entitelment", "Regular Used","Max Members","Flex Used","Flex Max Members","Subscribed Count"))
+ print("%35s %s %s %s %s %s" % ("-------------------", "------------","-----------","---------","----------------","----------------"))
if list == None:
print("")
return
for item in list:
- if item['current_members'] != 0:
- print("%35s %s" % (item['label'], str(item['current_members'])))
+ if item['subscribe_count'] != 0:
+ print("%35s %8s %10s %12s %10s %16s" % (item['label'], str(item['current_members']),str(item['max_members']),str(item['current_flex']),str(item['max_flex']),str(item['subscribe_count'])))
print("")
return
def printSystemEnts(id):
- print("%35s %s" % ("System Entitelment", "Used"))
- print("%35s %s" % ("------------------", "----"))
- query = """select T.label, G.current_members
+ print("%35s %s %s" % ("System Entitelment", "Used","Max Members"))
+ print("%35s %s %s" % ("------------------", "----","-----------"))
+ query = """select T.label, G.current_members,G.max_members
from rhnServerGroup G inner join rhnServerGroupType T on G.group_type = T.id
where org_id = %d order by T.label """ % (id)
list = run_query(query)
for item in list:
- print("%35s %s" % (item['label'], str(item['current_members'])))
+ print("%35s %3s %8s" % (item['label'], str(item['current_members']),str(item['max_members'])))
print("")
return
13 years, 3 months
backend/common backend/server client/rhel client/solaris client/tools proxy/installer proxy/proxy schema/spacewalk spacewalk/certs-tools web/modules
by Jan Pazdziora
backend/common/UserDictCase.py | 2 +-
backend/server/handlers/sat/__init__.py | 2 +-
client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py | 2 +-
client/rhel/rhnlib/rhn/SSL.py | 2 +-
client/rhel/rhnlib/rhn/SmartIO.py | 2 +-
client/solaris/rhnclient/rhn/client/rhnReg.py | 2 +-
client/solaris/rhnclient/rhn/rhn_check.py | 2 +-
client/solaris/rhnclient/rhn_check.py | 2 +-
client/tools/action-rpms/rhn-applet-actions/rhn_applet.py | 2 +-
client/tools/osad/src/osad.py | 2 +-
client/tools/osad/src/osad_client.py | 2 +-
client/tools/osad/test/simple-client.py | 2 +-
client/tools/osad/test/simple-dispatcher.py | 2 +-
client/tools/rhn-virtualization/virtualization/domain_control.py | 2 +-
client/tools/rhn-virtualization/virtualization/schedule_poller.py | 2 +-
client/tools/rhncfg/actions/ModeController.py | 2 +-
client/tools/rhncfg/actions/ModeControllerCreator.py | 2 +-
client/tools/rhncfg/actions/rhn-actions-control.py | 2 +-
client/tools/rhncfg/config_client/rhncfgcli_channels.py | 2 +-
client/tools/rhncfg/config_client/rhncfgcli_get.py | 2 +-
client/tools/rhncfg/config_common/rhn_main.py | 2 +-
client/tools/rhncfg/config_common/rhn_rpc.py | 2 +-
client/tools/rhncfg/config_common/rpc_wrapper.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_add.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_diff_revisions.py | 2 +-
client/tools/rhncfg/config_management/rhncfg_remove.py | 2 +-
client/tools/rhncfg/config_management/rpc_repository.py | 2 +-
client/tools/rhncfg/test/test_action_deploy.py | 2 +-
client/tools/rhncfg/test/test_action_diff.py | 2 +-
client/tools/rhncustominfo/rhn-custom-info.py | 2 +-
client/tools/rhnpush/rhnpush_cache.py | 2 +-
client/tools/rhnpush/rhnpush_v2.py | 2 +-
client/tools/rhnpush/test/testRhnpushConfig.py | 2 +-
client/tools/rhnpush/test/testUtils.py | 2 +-
client/tools/rhnpush/test/test_archive.py | 2 +-
client/tools/rhnpush/utils.py | 2 +-
proxy/installer/rhn_proxy_activate.py | 2 +-
proxy/proxy/rhnAuthProtocol.py | 2 +-
schema/spacewalk/postgres/packages/rhn_config.pkb | 2 +-
schema/spacewalk/postgres/packages/rhn_config.pks | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql | 2 +-
schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql | 2 +-
spacewalk/certs-tools/rhn_bootstrap_strings.py | 2 +-
spacewalk/certs-tools/sslToolCli.py | 2 +-
web/modules/dobby/Dobby/CLI/BackupCommands.pm | 2 +-
web/modules/dobby/Dobby/CLI/MaintCommands.pm | 2 +-
web/modules/rhn/RHN/DB/ContactMethod.pm | 2 +-
47 files changed, 47 insertions(+), 47 deletions(-)
New commits:
commit ace9bb2c98b724a007206fd62b11f32343c6bce2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 31 23:59:59 2010 +0000
Updating the copyright years to include 2010.
diff --git a/backend/common/UserDictCase.py b/backend/common/UserDictCase.py
index ddd1ee3..2a97492 100644
--- a/backend/common/UserDictCase.py
+++ b/backend/common/UserDictCase.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/backend/server/handlers/sat/__init__.py b/backend/server/handlers/sat/__init__.py
index a16f858..10f4606 100644
--- a/backend/server/handlers/sat/__init__.py
+++ b/backend/server/handlers/sat/__init__.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
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 fb35151..ca259da 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnserver.py
@@ -1,7 +1,7 @@
# rhn-client-tools
#
-# Copyright (C) 2006 Red Hat, Inc.
+# Copyright (c) 2006--2010 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
diff --git a/client/rhel/rhnlib/rhn/SSL.py b/client/rhel/rhnlib/rhn/SSL.py
index 817ca3d..3cfbebc 100644
--- a/client/rhel/rhnlib/rhn/SSL.py
+++ b/client/rhel/rhnlib/rhn/SSL.py
@@ -1,7 +1,7 @@
#
# Higher-level SSL objects used by rpclib
#
-# Copyright (c) 2002-2005 Red Hat, Inc.
+# Copyright (c) 2002--2010 Red Hat, Inc.
#
# Author: Mihai Ibanescu <misa(a)redhat.com>
diff --git a/client/rhel/rhnlib/rhn/SmartIO.py b/client/rhel/rhnlib/rhn/SmartIO.py
index c048caa..764e130 100644
--- a/client/rhel/rhnlib/rhn/SmartIO.py
+++ b/client/rhel/rhnlib/rhn/SmartIO.py
@@ -1,7 +1,7 @@
#
# Smart IO class
#
-# Copyright (c) 2002-2005 Red Hat, Inc.
+# Copyright (c) 2002--2010 Red Hat, Inc.
#
# Author: Mihai Ibanescu <misa(a)redhat.com>
diff --git a/client/solaris/rhnclient/rhn/client/rhnReg.py b/client/solaris/rhnclient/rhn/client/rhnReg.py
index 90d063c..eaa44a7 100755
--- a/client/solaris/rhnclient/rhn/client/rhnReg.py
+++ b/client/solaris/rhnclient/rhn/client/rhnReg.py
@@ -1,7 +1,7 @@
#!/usr/bin/python
#
# RHN Registration Client
-# Copyright (c) 2000-2002 Red Hat, Inc.
+# Copyright (c) 2000--2010 Red Hat, Inc.
#
# Authors:
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/solaris/rhnclient/rhn/rhn_check.py b/client/solaris/rhnclient/rhn/rhn_check.py
index 4f5985f..bcc1a37 100755
--- a/client/solaris/rhnclient/rhn/rhn_check.py
+++ b/client/solaris/rhnclient/rhn/rhn_check.py
@@ -3,7 +3,7 @@
# Python client for checking periodically for posted actions
# on the Red Hat Network servers.
#
-# Copyright (C) 2000-2002, Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2000--2010 Red Hat, Inc. Distributed under GPL.
# Authors: Cristian Gafton <gafton(a)redhat.com>,
# Preston Brown <pbrown(a)redhat.com>
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/solaris/rhnclient/rhn_check.py b/client/solaris/rhnclient/rhn_check.py
index c7783a3..d8fbe73 100755
--- a/client/solaris/rhnclient/rhn_check.py
+++ b/client/solaris/rhnclient/rhn_check.py
@@ -3,7 +3,7 @@
# Python client for checking periodically for posted actions
# on the Red Hat Network servers.
#
-# Copyright (C) 2000-2002, Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2000--2010 Red Hat, Inc. Distributed under GPL.
# Authors: Cristian Gafton <gafton(a)redhat.com>,
# Preston Brown <pbrown(a)redhat.com>
# Adrian Likins <alikins(a)redhat.com>
diff --git a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
index 991401d..ebcbeb5 100755
--- a/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
+++ b/client/tools/action-rpms/rhn-applet-actions/rhn_applet.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/osad/src/osad.py b/client/tools/osad/src/osad.py
index fecb8c4..8e95f47 100644
--- a/client/tools/osad/src/osad.py
+++ b/client/tools/osad/src/osad.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/osad/src/osad_client.py b/client/tools/osad/src/osad_client.py
index 8b24201..390a42b 100644
--- a/client/tools/osad/src/osad_client.py
+++ b/client/tools/osad/src/osad_client.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/osad/test/simple-client.py b/client/tools/osad/test/simple-client.py
index b8d4362..a29ed21 100644
--- a/client/tools/osad/test/simple-client.py
+++ b/client/tools/osad/test/simple-client.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/osad/test/simple-dispatcher.py b/client/tools/osad/test/simple-dispatcher.py
index a5de6cd..58632b1 100644
--- a/client/tools/osad/test/simple-dispatcher.py
+++ b/client/tools/osad/test/simple-dispatcher.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhn-virtualization/virtualization/domain_control.py b/client/tools/rhn-virtualization/virtualization/domain_control.py
index 4692b7a..a028313 100755
--- a/client/tools/rhn-virtualization/virtualization/domain_control.py
+++ b/client/tools/rhn-virtualization/virtualization/domain_control.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006 Red Hat, Inc. Distributed under GPL.
+# Copyright (c) 2006--2010 Red Hat, Inc. Distributed under GPL.
#
# Author: Peter Vetere <pvetere(a)redhat.com>
#
diff --git a/client/tools/rhn-virtualization/virtualization/schedule_poller.py b/client/tools/rhn-virtualization/virtualization/schedule_poller.py
index 4f793df..ae74f0b 100644
--- a/client/tools/rhn-virtualization/virtualization/schedule_poller.py
+++ b/client/tools/rhn-virtualization/virtualization/schedule_poller.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/actions/ModeController.py b/client/tools/rhncfg/actions/ModeController.py
index 97ee577..9de0b41 100644
--- a/client/tools/rhncfg/actions/ModeController.py
+++ b/client/tools/rhncfg/actions/ModeController.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/actions/ModeControllerCreator.py b/client/tools/rhncfg/actions/ModeControllerCreator.py
index 15663cb..75dc860 100644
--- a/client/tools/rhncfg/actions/ModeControllerCreator.py
+++ b/client/tools/rhncfg/actions/ModeControllerCreator.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/actions/rhn-actions-control.py b/client/tools/rhncfg/actions/rhn-actions-control.py
index 7ffe98f..d295ea5 100755
--- a/client/tools/rhncfg/actions/rhn-actions-control.py
+++ b/client/tools/rhncfg/actions/rhn-actions-control.py
@@ -1,6 +1,6 @@
#!/usr/bin/python
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_channels.py b/client/tools/rhncfg/config_client/rhncfgcli_channels.py
index c05939e..1be7fb0 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_channels.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_channels.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_client/rhncfgcli_get.py b/client/tools/rhncfg/config_client/rhncfgcli_get.py
index 588b6e2..bfa426d 100644
--- a/client/tools/rhncfg/config_client/rhncfgcli_get.py
+++ b/client/tools/rhncfg/config_client/rhncfgcli_get.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_common/rhn_main.py b/client/tools/rhncfg/config_common/rhn_main.py
index 54ef899..362ba2b 100644
--- a/client/tools/rhncfg/config_common/rhn_main.py
+++ b/client/tools/rhncfg/config_common/rhn_main.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_common/rhn_rpc.py b/client/tools/rhncfg/config_common/rhn_rpc.py
index 94a835e..4cecf00 100644
--- a/client/tools/rhncfg/config_common/rhn_rpc.py
+++ b/client/tools/rhncfg/config_common/rhn_rpc.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_common/rpc_wrapper.py b/client/tools/rhncfg/config_common/rpc_wrapper.py
index 4789376..66e902f 100644
--- a/client/tools/rhncfg/config_common/rpc_wrapper.py
+++ b/client/tools/rhncfg/config_common/rpc_wrapper.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_management/rhncfg_add.py b/client/tools/rhncfg/config_management/rhncfg_add.py
index 19ebc4d..0795691 100644
--- a/client/tools/rhncfg/config_management/rhncfg_add.py
+++ b/client/tools/rhncfg/config_management/rhncfg_add.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
index 7b9ecd5..9b0e17a 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff_revisions.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_management/rhncfg_remove.py b/client/tools/rhncfg/config_management/rhncfg_remove.py
index 73de1cf..c4b190c 100644
--- a/client/tools/rhncfg/config_management/rhncfg_remove.py
+++ b/client/tools/rhncfg/config_management/rhncfg_remove.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/config_management/rpc_repository.py b/client/tools/rhncfg/config_management/rpc_repository.py
index 71d7260..eed2901 100644
--- a/client/tools/rhncfg/config_management/rpc_repository.py
+++ b/client/tools/rhncfg/config_management/rpc_repository.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/test/test_action_deploy.py b/client/tools/rhncfg/test/test_action_deploy.py
index ad57558..75e3f5b 100644
--- a/client/tools/rhncfg/test/test_action_deploy.py
+++ b/client/tools/rhncfg/test/test_action_deploy.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncfg/test/test_action_diff.py b/client/tools/rhncfg/test/test_action_diff.py
index 2d8e7ac..66cead7 100644
--- a/client/tools/rhncfg/test/test_action_diff.py
+++ b/client/tools/rhncfg/test/test_action_diff.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhncustominfo/rhn-custom-info.py b/client/tools/rhncustominfo/rhn-custom-info.py
index 320cd64..21eec26 100755
--- a/client/tools/rhncustominfo/rhn-custom-info.py
+++ b/client/tools/rhncustominfo/rhn-custom-info.py
@@ -1,6 +1,6 @@
#!/usr/bin/python -u
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/rhnpush_cache.py b/client/tools/rhnpush/rhnpush_cache.py
index c7db479..53e2136 100644
--- a/client/tools/rhnpush/rhnpush_cache.py
+++ b/client/tools/rhnpush/rhnpush_cache.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/rhnpush_v2.py b/client/tools/rhnpush/rhnpush_v2.py
index 5deb4d3..810941f 100644
--- a/client/tools/rhnpush/rhnpush_v2.py
+++ b/client/tools/rhnpush/rhnpush_v2.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/test/testRhnpushConfig.py b/client/tools/rhnpush/test/testRhnpushConfig.py
index 5bb9284..fe1672a 100644
--- a/client/tools/rhnpush/test/testRhnpushConfig.py
+++ b/client/tools/rhnpush/test/testRhnpushConfig.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/test/testUtils.py b/client/tools/rhnpush/test/testUtils.py
index d1e0e05..d1cfbca 100644
--- a/client/tools/rhnpush/test/testUtils.py
+++ b/client/tools/rhnpush/test/testUtils.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/test/test_archive.py b/client/tools/rhnpush/test/test_archive.py
index 569915a..426595b 100644
--- a/client/tools/rhnpush/test/test_archive.py
+++ b/client/tools/rhnpush/test/test_archive.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/client/tools/rhnpush/utils.py b/client/tools/rhnpush/utils.py
index f0a243a..0b687f8 100644
--- a/client/tools/rhnpush/utils.py
+++ b/client/tools/rhnpush/utils.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/proxy/installer/rhn_proxy_activate.py b/proxy/installer/rhn_proxy_activate.py
index 8044a83..476a1ff 100644
--- a/proxy/installer/rhn_proxy_activate.py
+++ b/proxy/installer/rhn_proxy_activate.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/proxy/proxy/rhnAuthProtocol.py b/proxy/proxy/rhnAuthProtocol.py
index c76501d..09fdaf4 100644
--- a/proxy/proxy/rhnAuthProtocol.py
+++ b/proxy/proxy/rhnAuthProtocol.py
@@ -1,6 +1,6 @@
# Communication routines for sockets connecting to the auth token cache daemon
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/schema/spacewalk/postgres/packages/rhn_config.pkb b/schema/spacewalk/postgres/packages/rhn_config.pkb
index 395fad3..98f5bd1 100644
--- a/schema/spacewalk/postgres/packages/rhn_config.pkb
+++ b/schema/spacewalk/postgres/packages/rhn_config.pkb
@@ -1,6 +1,6 @@
-- oracle equivalent source sha1 c9b519752b694fa39fd8685a8b86ae05b2131f64
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- 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
diff --git a/schema/spacewalk/postgres/packages/rhn_config.pks b/schema/spacewalk/postgres/packages/rhn_config.pks
index 988eab7..df69cec 100644
--- a/schema/spacewalk/postgres/packages/rhn_config.pks
+++ b/schema/spacewalk/postgres/packages/rhn_config.pks
@@ -1,6 +1,6 @@
-- oracle equivalent source sha1 8d34647e8827f2df28d6de06df04340eb7fd1528
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- 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
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql
index 44a5c5a..5f4475c 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/139-rhnKickstartableTrees.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- 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
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql b/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql
index f1341f1..fa9c92d 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-0.3-to-spacewalk-schema-0.4/156-rhnPackage-compat-number.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- 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
diff --git a/spacewalk/certs-tools/rhn_bootstrap_strings.py b/spacewalk/certs-tools/rhn_bootstrap_strings.py
index e2938fa..af0f4fd 100644
--- a/spacewalk/certs-tools/rhn_bootstrap_strings.py
+++ b/spacewalk/certs-tools/rhn_bootstrap_strings.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/spacewalk/certs-tools/sslToolCli.py b/spacewalk/certs-tools/sslToolCli.py
index 894027d..1389ea0 100644
--- a/spacewalk/certs-tools/sslToolCli.py
+++ b/spacewalk/certs-tools/sslToolCli.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/web/modules/dobby/Dobby/CLI/BackupCommands.pm b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
index 6f117ad..650aa9d 100644
--- a/web/modules/dobby/Dobby/CLI/BackupCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/BackupCommands.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/web/modules/dobby/Dobby/CLI/MaintCommands.pm b/web/modules/dobby/Dobby/CLI/MaintCommands.pm
index 1081e6a..1543b51 100644
--- a/web/modules/dobby/Dobby/CLI/MaintCommands.pm
+++ b/web/modules/dobby/Dobby/CLI/MaintCommands.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
diff --git a/web/modules/rhn/RHN/DB/ContactMethod.pm b/web/modules/rhn/RHN/DB/ContactMethod.pm
index 30fdefd..e568ef4 100644
--- a/web/modules/rhn/RHN/DB/ContactMethod.pm
+++ b/web/modules/rhn/RHN/DB/ContactMethod.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# 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
13 years, 3 months