rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit d569c2a98dbb8b4a8b7c429d0ae0f4f824118c22
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 6 15:49:22 2010 +0100
Automatic commit of package [spacewalk-web] release [0.8.8-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index b6d7b88..4afc751 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.8.7-1 web/
+0.8.8-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 6747169..d8b0567 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: 0.8.7
+Version: 0.8.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -269,7 +269,7 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
-* Wed Jan 06 2010 Jan Pazdziora 0.8.7-1
+* Wed Jan 06 2010 Jan Pazdziora 0.8.8-1
- Fixed the forgot_* emails.
- More dead code removals.
14 years, 3 months
web/spacewalk-web.spec
by Jan Pazdziora
web/spacewalk-web.spec | 1 -
1 file changed, 1 deletion(-)
New commits:
commit fb879a8c054668e59f0b66a3bf5c77a71abfacee
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 6 15:49:03 2010 +0100
Drop removed RHN/UserGroup.pm from .spec as well.
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5ad1527..6747169 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -208,7 +208,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/TokenGen/
%{perl_vendorlib}/RHN/User.pm
%{perl_vendorlib}/RHN/UserActions.pm
-%{perl_vendorlib}/RHN/UserGroup.pm
%{perl_vendorlib}/RHN/Utils.pm
%{_mandir}/man3/RHN::Command.3pm.gz
%{_mandir}/man3/RHN::ContactGroup.3pm.gz
14 years, 3 months
Changes to 'refs/tags/spacewalk-web-0.8.7-1'
by Jan Pazdziora
Tag 'spacewalk-web-0.8.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-01-06 13:29 +0000
Tagging package [spacewalk-web] version [0.8.7-1] in directory [web/].
Changes since spacewalk-backend-0.8.16-1:
Jan Pazdziora (113):
Removing bunch of unused methods from RHN::DB::ConfigFile:
get_file_list, set_file_list, and delete_list not called from anywhere, removing.
Removal of set_file_list made path_to_id unused, removing.
Previous removals made RHN::ConfigFile and RHN::DB::ConfigFile empty, likely not needed, removing.
Removing bunch of unused methods from RHN::DB::User:
Removing bunch of unused methods from RHN::DB::KSTree:
associated_errata and create_action not called from anywhere, removing.
Removing bunch of unused methods from RHN::DB::Org:
create_new_user not used in Perl stack, removing.
banish not used anywhere, removing.
Removal of create_new_user and banish made create_new_org unused, removing.
approve not used anywhere, removing.
Removal of approve and banish made remove_from_group unused.
get_category_id and create_template_string not called from anywhere, removing.
delete_probe and scout_for_probe not called from anywhere, removing.
lookup_consume not called from anywhere, removing.
list_scouts_by_org not called from anywhere, removing.
channel_edit_list not called from anywhere, removing.
are_notifications_squelched, squelch_notifications, and unsquelch_notifications not called from anywhere, removing.
Removal of Sniglets::MonitoringConfig made RHN::MonitoringConfigMacro unused, removing.
Removal of RHN::MonitoringConfigMacro made RHN::DB::MonitoringConfigMacro unused, removing.
change_set_base_channel not called from anywhere, removing.
update_query_lob and insert_query_lob not called from anywhere, removing.
Removing bunch of unused methods from RHN::DB::Profile:
None of the (remaining) three functions is used, making RHN::DB::Downloads obsolete, removing.
Removing bunch of unused methods from RHN::DB::Kickstart::Session:
Removal of get_tiny_url made tinify_path unused, removing.
Removal of mark_failed made delete_systems_from_action unused, removing.
immediate_add and immediate_remove not called from anywhere, removing.
Removing bunch of unused methods from RHN::DB::ServerGroup:
retrieve is not called from Perl stack, removing.
org_key_list is not called from anywhere, removing.
lookup_group_type_id is not called from anywhere, removing.
lookup_snapshot is not called from anywhere, removing.
lookup_action is not called from anywhere, removing.
lookup_org is not called from anywhere, removing.
RHN::Daemon not use'd anywhere, removing.
send_raw is not called from anywhere, removing.
components_available_for_user is not called from anywhere, removing.
Removal of components_available_for_user made components_available unused, removing.
components_for_user and set_user_components is not called from anywhere, removing.
Removal of components_for_user and set_user_components in RHN::Grail made them unused in RHN::DB::Grail as well, removing.
Previous removals made RHN::Grail and RHN::DB::Grail noops, removing.
lookup_widget_value is not called from anywhere, removing.
long_date_with_zone is not called from anywhere, removing.
Removing most of code from RHN::Kickstart::Post as the methods were not referenced from anywhere.
valid_helpers not used anywhere, removing.
Removing bunch of unused methods from RHN::Kickstart::IPRange:
render_modes and sql_install_query are not called anywhere, removing.
profiling_markpoint is not called anywhere, removing.
Removing bunch of unused functions from PXT::Utils:
clear_traces is nowhere used, removing.
Removing bunch of unused methods from PXT::Request:
get_failed_message is not used, removing.
get_action_registry and set_action_registry are not called anywhere, removing.
get_steps and set_steps are not called anywhere, removing.
pop_argument does not seem to be used, removing.
set_url and get_save_session do not appear elsewhere, removing.
get_requirements and set_requirements do not appear elsewhere, removing.
remove_requirement, get_requirement_registry, and set_requirement_registry are not called anywhere, removing.
current_step, import_session, and _check_stored_data are not referenced in the code, removing.
Removal of rpc_fault made %fault_messages unused, removing.
get_instance_id and set_instance_id are not referenced, removing.
Removing bunch of functions from RHN::DB::SatInstall:
org_entitlement_choices and allowed_entitlement_transition are not used anywhere, removing.
Removal of org_entitlement_choices made bunch of *_slot_name's unused, removing.
Removal of Sniglets::MonitoringConfig made push_monitoring_config_changes unused.
Removing bunch of unused functions from RHN::SatInstall:
Removing some more functions from RHN::SatInstall, that are duplicated in spacewalk-setup now:
Removal of Sniglets::MonitoringConfig made restart_satellite unused, removing.
Removal of restart_satellite made prepare_for_fork unused, removing.
lookup_server_group is not used anywhere, removing.
base_entitlement_box, addon_entitlement_box, and store_bounce not referenced, removing.
Removal of package_search_form made search_arch_list unused, removing.
Removal of probe_state_summary.pxi made rhn-probe-state-summary and probe_state_summary unused, removing.
enable_notification_cron and disable_notification_cron are not used in our code base, removing.
rhn-system-base-channel-select is not used, removing, as well as system_base_channel_select.
Removal of system_base_channel_select made user_subscribable_bases_for_system unused, removing.
base_channel_alteration.pxt is now replaced by /rhn/channel/ssm/BaseChannelSubscribe.do, removing.
Removal of user_subscribable_bases_for_system and sscd_change_base_channels_cb made default_base_channel unused, removing.
Removal of user_subscribable_bases_for_system made verify_channel_arch_compat unused, removing.
Removal of base_channel_alteration.pxt made rhn-sscd-base-channel-alteration and sscd_base_channel_alteration unused, removing.
Removal of sscd_change_base_channels_cb made num_proxies_in_set and num_satellites_in_set unused, removing.
Removal of sscd_change_base_channels_cb made system_set_change_base_channels unused, removing.
Removal of sscd_change_base_channels_cb made schedule_errata_cache_update unused, removing.
Removal of sscd_base_channel_alteration made system_set_base_channels unused, removing.
Removal of sscd_base_channel_alteration made user_subscribable_base_channels unused, removing.
Removal of errata_cache_update.pxi made rhn:update_errata_cache and update_errata_cache not used, removing.
Removal of edit_template_string.xml made rhn:catch_form and thus catch_form_cb and catch_form unused, removing.
rhn:sscd_confirm_package_verification not used, removing, as well as sscd_confirm_package_verification_cb.
Removal of sscd_confirm_package_verification_cb made sscd_schedule_package_verify unused, removing.
Callbacks rhn:sscd_confirm_package_upgrades, rhn:sscd_confirm_package_installations, and rhn:sscd_confirm_package_removals not used, removing.
get_user_id, set_user_id, get_server_id, and set_server_id do not seem to be used, removing.
available_entitlements and installable are not used, removing; also removing installable_path.
Removal of get_rhn_extras_channel made latest_package_like unused, removing.
Removal of get_rhn_kickstart_package made latest_package_equal unused, removing.
get_channel_arch is not used, removing; also removing default_tree which is called from get_channel_arch.
Removal of mark_failed made current_server (and thus new_server and old_server) unused, removing.
Removal of find_responsible_user made org_admins unused, removing.
create_package does not seem to be used, removing.
deactivate_satellite is not called, removing.
Removal of base_entitlement_box made can_switch_base_entitlement unused, removing.
satellite_cert is not called, removing.
Removal of Sniglets::Inspector (its disable_user_toggle_cb) made disable_user and enable_user unused, removing, as well as _change_user_state.
entitlement_grants_service not used, removing.
Removing %feature_universe and %excluded_features which are used only once.
Removal of create_cert_text made current_generation unused, removing.
lookup_server is not used, removing.
lookup_tag is not used, removing.
dump_time not called from anywhere, removing.
Update copyright in web subtree for files changed in 2010.
Update copyright in web subtree for files changed in 2009.
Automatic commit of package [spacewalk-web] release [0.8.7-1].
Miroslav Suchý (7):
convert comments to docstring
code cleanup - removal of long time commented code
convert comments to docstring
code cleanup - xml_dump_version in this class (nor its childs) is never used
175155 - bump up protocol version to 3.5
add comments to what some xml dump version means
175155 - bump up protocol version to 3.5
---
backend/common/rhnCache.py | 14
backend/common/rhnConfig.py | 15
backend/rhn-conf/rhn_server_iss.conf | 2
backend/rhn-conf/rhn_server_satellite.conf | 2
backend/satellite_exporter/constants.py | 20
backend/satellite_tools/connection.py | 3
backend/satellite_tools/exporter/exporter.py | 1
backend/satellite_tools/satellite-sync.sgml | 2
backend/satellite_tools/test/test-download.py | 2
backend/satellite_tools/test/test-errata.py | 2
backend/satellite_tools/xmlSource.py | 1
rel-eng/packages/spacewalk-web | 2
web/html/network/systems/ssm/channels/base_channel_alteration.pxt | 50
web/modules/grail/Grail/Canvas.pm | 3
web/modules/grail/Grail/Component.pm | 28
web/modules/grail/Grail/Frame.pm | 2
web/modules/pxt/PXT/ApacheHandler.pm | 13
web/modules/pxt/PXT/Request.pm | 113 -
web/modules/pxt/PXT/Trace.pm | 11
web/modules/pxt/PXT/Utils.pm | 178 --
web/modules/rhn/MANIFEST | 2
web/modules/rhn/RHN/Action.pm | 10
web/modules/rhn/RHN/AppInstall/ACL.pm | 8
web/modules/rhn/RHN/AppInstall/ActionHandler.pm | 24
web/modules/rhn/RHN/AppInstall/Process.pm | 20
web/modules/rhn/RHN/AppInstall/Process/Step/Action.pm | 9
web/modules/rhn/RHN/AppInstall/Process/Step/Redirect.pm | 17
web/modules/rhn/RHN/AppInstall/Process/Step/Requirements.pm | 21
web/modules/rhn/RHN/AppInstall/RequirementHandler.pm | 35
web/modules/rhn/RHN/AppInstall/Session.pm | 50
web/modules/rhn/RHN/Channel.pm | 24
web/modules/rhn/RHN/ConfigFile.pm | 24
web/modules/rhn/RHN/DB.pm | 15
web/modules/rhn/RHN/DB/Action.pm | 46
web/modules/rhn/RHN/DB/AppInstall/Session.pm | 56
web/modules/rhn/RHN/DB/Channel.pm | 106 -
web/modules/rhn/RHN/DB/ChannelEditor.pm | 29
web/modules/rhn/RHN/DB/Command.pm | 4
web/modules/rhn/RHN/DB/ConfigChannel.pm | 2
web/modules/rhn/RHN/DB/ConfigFile.pm | 82 -
web/modules/rhn/RHN/DB/ConfigRevision.pm | 2
web/modules/rhn/RHN/DB/CryptoKey.pm | 11
web/modules/rhn/RHN/DB/DataSource.pm | 2
web/modules/rhn/RHN/DB/Downloads.pm | 94 -
web/modules/rhn/RHN/DB/EmailAddress.pm | 2
web/modules/rhn/RHN/DB/Entitlements.pm | 16
web/modules/rhn/RHN/DB/Errata.pm | 2
web/modules/rhn/RHN/DB/ErrataEditor.pm | 2
web/modules/rhn/RHN/DB/FileList.pm | 72 -
web/modules/rhn/RHN/DB/Grail.pm | 88 -
web/modules/rhn/RHN/DB/KSTree.pm | 74 -
web/modules/rhn/RHN/DB/Kickstart.pm | 34
web/modules/rhn/RHN/DB/Kickstart/Session.pm | 102 -
web/modules/rhn/RHN/DB/MonitoringConfigMacro.pm | 317 -----
web/modules/rhn/RHN/DB/Notes.pm | 2
web/modules/rhn/RHN/DB/Org.pm | 561 ---------
web/modules/rhn/RHN/DB/Package.pm | 9
web/modules/rhn/RHN/DB/Probe.pm | 58
web/modules/rhn/RHN/DB/Profile.pm | 136 --
web/modules/rhn/RHN/DB/SatCluster.pm | 17
web/modules/rhn/RHN/DB/SatInstall.pm | 178 --
web/modules/rhn/RHN/DB/Scheduler.pm | 71 -
web/modules/rhn/RHN/DB/Server.pm | 204 ---
web/modules/rhn/RHN/DB/Server/CdDevice.pm | 2
web/modules/rhn/RHN/DB/Server/HwDevice.pm | 2
web/modules/rhn/RHN/DB/Server/NetInfo.pm | 2
web/modules/rhn/RHN/DB/Server/NetInterface.pm | 2
web/modules/rhn/RHN/DB/Server/StorageDevice.pm | 2
web/modules/rhn/RHN/DB/ServerActions.pm | 60 -
web/modules/rhn/RHN/DB/ServerGroup.pm | 202 ---
web/modules/rhn/RHN/DB/Set.pm | 89 -
web/modules/rhn/RHN/DB/TableClass.pm | 39
web/modules/rhn/RHN/DB/TemplateString.pm | 27
web/modules/rhn/RHN/DB/TinyURL.pm | 43
web/modules/rhn/RHN/DB/Token.pm | 2
web/modules/rhn/RHN/DB/User.pm | 594 ----------
web/modules/rhn/RHN/Daemon.pm | 322 -----
web/modules/rhn/RHN/DataSource.pm | 2
web/modules/rhn/RHN/Date.pm | 10
web/modules/rhn/RHN/Entitlements.pm | 90 -
web/modules/rhn/RHN/Errata.pm | 2
web/modules/rhn/RHN/Exception.pm | 2
web/modules/rhn/RHN/Form.pm | 2
web/modules/rhn/RHN/Form/Response.pm | 12
web/modules/rhn/RHN/Grail.pm | 42
web/modules/rhn/RHN/Kickstart.pm | 2
web/modules/rhn/RHN/Kickstart/IPRange.pm | 110 -
web/modules/rhn/RHN/Kickstart/Post.pm | 310 -----
web/modules/rhn/RHN/Kickstart/Pre.pm | 8
web/modules/rhn/RHN/Mail.pm | 26
web/modules/rhn/RHN/MonitoringConfigMacro.pm | 47
web/modules/rhn/RHN/Org.pm | 10
web/modules/rhn/RHN/Package.pm | 2
web/modules/rhn/RHN/Postal.pm | 2
web/modules/rhn/RHN/ProxyInstall.pm | 41
web/modules/rhn/RHN/SatInstall.pm | 355 -----
web/modules/rhn/RHN/SatelliteCert.pm | 7
web/modules/rhn/RHN/SearchTypes.pm | 2
web/modules/rhn/RHN/Server.pm | 10
web/modules/rhn/RHN/ServerGroup.pm | 10
web/modules/rhn/RHN/ServerNotes.pm | 2
web/modules/rhn/RHN/SystemSnapshot.pm | 10
web/modules/rhn/RHN/Tag.pm | 10
web/modules/rhn/RHN/TokenGen/Local.pm | 5
web/modules/sniglets/Sniglets/ActivationKeys.pm | 2
web/modules/sniglets/Sniglets/AppInstall.pm | 2
web/modules/sniglets/Sniglets/Channel.pm | 213 ---
web/modules/sniglets/Sniglets/ChannelEditor.pm | 2
web/modules/sniglets/Sniglets/ConfigManagement.pm | 2
web/modules/sniglets/Sniglets/Downloads.pm | 2
web/modules/sniglets/Sniglets/Errata.pm | 7
web/modules/sniglets/Sniglets/ErrataEditor.pm | 31
web/modules/sniglets/Sniglets/Forms.pm | 107 -
web/modules/sniglets/Sniglets/HTML.pm | 2
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 2
web/modules/sniglets/Sniglets/ListView/FileList.pm | 2
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 2
web/modules/sniglets/Sniglets/ListView/List.pm | 2
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2
web/modules/sniglets/Sniglets/ListView/Style.pm | 2
web/modules/sniglets/Sniglets/Lists.pm | 2
web/modules/sniglets/Sniglets/Navi/Style.pm | 2
web/modules/sniglets/Sniglets/Packages.pm | 28
web/modules/sniglets/Sniglets/Probes.pm | 114 -
web/modules/sniglets/Sniglets/Profiles.pm | 2
web/modules/sniglets/Sniglets/PublicErrata.pm | 2
web/modules/sniglets/Sniglets/Search.pm | 2
web/modules/sniglets/Sniglets/ServerActions.pm | 2
web/modules/sniglets/Sniglets/ServerGroup.pm | 2
web/modules/sniglets/Sniglets/ServerNotes.pm | 2
web/modules/sniglets/Sniglets/Servers.pm | 172 --
web/modules/sniglets/Sniglets/Sets.pm | 2
web/modules/sniglets/Sniglets/Users.pm | 3
web/modules/sniglets/Sniglets/Utils.pm | 2
web/spacewalk-web.spec | 12
135 files changed, 159 insertions(+), 6193 deletions(-)
---
14 years, 3 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 9a79cc66fb5c659e2536cbcd7735dfb6e32462c1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 6 14:29:58 2010 +0100
Automatic commit of package [spacewalk-web] release [0.8.7-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 68c7c22..b6d7b88 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.8.6-1 web/
+0.8.7-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 3b57581..5ad1527 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: 0.8.6
+Version: 0.8.7
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -270,6 +270,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Jan 06 2010 Jan Pazdziora 0.8.7-1
+- Fixed the forgot_* emails.
+- More dead code removals.
+
* Mon Jan 04 2010 Michael Mraka <michael.mraka(a)redhat.com> 0.8.6-1
- more dead code removed
* Sat Dec 26 2009 Jan Pazdziora 0.8.5-1
14 years, 3 months
backend/rhn-conf
by Miroslav Suchý
backend/rhn-conf/rhn_server_iss.conf | 2 +-
backend/rhn-conf/rhn_server_satellite.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 331cd64542b25e07147e755e93252489370f2956
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 6 12:14:20 2010 +0100
175155 - bump up protocol version to 3.5
diff --git a/backend/rhn-conf/rhn_server_iss.conf b/backend/rhn-conf/rhn_server_iss.conf
index f792dc2..c3ff4ce 100644
--- a/backend/rhn-conf/rhn_server_iss.conf
+++ b/backend/rhn-conf/rhn_server_iss.conf
@@ -4,7 +4,7 @@
# variables which affects live synchronization between two Spacewalk or
# between Satellite and hosted.
-xml_dump_version = 4.0
+xml_dump_version = 3.5
use_database_cache = 0
diff --git a/backend/rhn-conf/rhn_server_satellite.conf b/backend/rhn-conf/rhn_server_satellite.conf
index 0381070..341c346 100644
--- a/backend/rhn-conf/rhn_server_satellite.conf
+++ b/backend/rhn-conf/rhn_server_satellite.conf
@@ -29,4 +29,4 @@ cache_refresh_level = 2
cache_refresh_count_max = 5
# dump version
-xml_dump_version = 4.0
+xml_dump_version = 3.5
14 years, 3 months
6 commits - backend/common backend/satellite_exporter backend/satellite_tools
by Miroslav Suchý
backend/common/rhnCache.py | 14 ++++++--------
backend/common/rhnConfig.py | 15 +++++----------
backend/satellite_exporter/constants.py | 20 +++++++++++++++++++-
backend/satellite_tools/connection.py | 3 ++-
backend/satellite_tools/exporter/exporter.py | 1 -
backend/satellite_tools/satellite-sync.sgml | 2 +-
backend/satellite_tools/test/test-download.py | 2 +-
backend/satellite_tools/test/test-errata.py | 2 +-
backend/satellite_tools/xmlSource.py | 1 +
9 files changed, 36 insertions(+), 24 deletions(-)
New commits:
commit a886cdc61a95ec99925c63bdee47bab17f938ffd
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 6 12:09:55 2010 +0100
add comments to what some xml dump version means
diff --git a/backend/satellite_exporter/constants.py b/backend/satellite_exporter/constants.py
index 1c71404..a0c968e 100644
--- a/backend/satellite_exporter/constants.py
+++ b/backend/satellite_exporter/constants.py
@@ -32,3 +32,12 @@ EUS_SUPPORTED_VERSION = 3.2
# Support for virt details (rhn500+)
VIRT_SUPPORTED_VERSION = 3.1
+
+# Historical log
+# * Version 2.2 2004-03-02
+# arch types introduced in all the arch dumps
+# * Version 2.3 2004-09-13
+# added short package dumps per channel
+# * Version 3.0 2005-01-13
+# required major version change for channel family merging (#136525)
+
diff --git a/backend/satellite_tools/xmlSource.py b/backend/satellite_tools/xmlSource.py
index 2af35ff..2b346dc 100644
--- a/backend/satellite_tools/xmlSource.py
+++ b/backend/satellite_tools/xmlSource.py
@@ -250,6 +250,7 @@ class BaseDispatchHandler(ContentHandler, ErrorHandler):
# Particular case: a satellite handler
class SatelliteDispatchHandler(BaseDispatchHandler):
rootElement = 'rhn-satellite'
+ # this is last version of channel dump we support
version = "3.0"
# Historical log
commit 4224697a524bc860894de87b54dd7ef0711f122d
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 6 12:09:20 2010 +0100
175155 - bump up protocol version to 3.5
we need to bump it up to 3.4 which means we support to CD
but we have new feature too, SHA256, so bumping up directly to 3.5
diff --git a/backend/satellite_exporter/constants.py b/backend/satellite_exporter/constants.py
index 1d66ead..1c71404 100644
--- a/backend/satellite_exporter/constants.py
+++ b/backend/satellite_exporter/constants.py
@@ -16,7 +16,16 @@
Constant values (protocol versions, etc) for satellite sync/exporter.
"""
-PROTOCOL_VERSION = 3.3
+PROTOCOL_VERSION = 3.5
+
+# Support for checksums other then md5
+SHA256_SUPPORTED_VERSION = 3.5
+
+# Support for redirects to CDN (Akamai)
+REDIRECTS_SUPPORTED_VERSION = 3.4
+
+# Support for supplying comps.xml files (package groups)
+COMPS_SUPPORTED_VERSION = 3.3
# Support for update model details (rhn510+)
EUS_SUPPORTED_VERSION = 3.2
diff --git a/backend/satellite_tools/connection.py b/backend/satellite_tools/connection.py
index 3e26a62..ee7f401 100644
--- a/backend/satellite_tools/connection.py
+++ b/backend/satellite_tools/connection.py
@@ -22,6 +22,7 @@ import string
import gzipstream
from rhn import rpclib
+from satellite_exporter import constants
__version__ = "0.1"
@@ -89,7 +90,7 @@ class _Server(rpclib.Server):
class StreamConnection(_Server):
def __init__(self, uri, proxy=None, username=None, password=None,
- refreshCallback=None, xml_dump_version="3.3"):
+ refreshCallback=None, xml_dump_version=constants.PROTOCOL_VERSION):
_Server.__init__(self, uri, proxy=proxy, username=username,
password=password, refreshCallback=refreshCallback)
self.add_header("X-RHN-Satellite-XML-Dump-Version", xml_dump_version)
diff --git a/backend/satellite_tools/satellite-sync.sgml b/backend/satellite_tools/satellite-sync.sgml
index 23ee69e..ed7e7ae 100644
--- a/backend/satellite_tools/satellite-sync.sgml
+++ b/backend/satellite_tools/satellite-sync.sgml
@@ -7,7 +7,7 @@
<RefMeta>
<RefEntryTitle>satellite-sync</RefEntryTitle><manvolnum>8</manvolnum>
-<RefMiscInfo>Version 3.3.0</RefMiscInfo>
+<RefMiscInfo>Version 4.0.0</RefMiscInfo>
</RefMeta>
<RefNameDiv>
diff --git a/backend/satellite_tools/test/test-download.py b/backend/satellite_tools/test/test-download.py
index 8ec838d..2c826b5 100644
--- a/backend/satellite_tools/test/test-download.py
+++ b/backend/satellite_tools/test/test-download.py
@@ -26,7 +26,7 @@ if __name__ == '__main__':
#s = StreamConnection("http://xmlrpc.rhn.webqa.redhat.com/SAT-DUMP",
s = StreamConnection("http://satellite.rhn.redhat.com/SAT-DUMP",
#s = StreamConnection("http://xmlrpc.rhn.webdev.redhat.com/SAT-DUMP",
- xml_dump_version="3.0")
+ )
systemid = open("systemid-satellite-live").read()
#systemid = open("systemid-test01-devel").read()
#systemid = open("/tmp/systemid-test05").read()
diff --git a/backend/satellite_tools/test/test-errata.py b/backend/satellite_tools/test/test-errata.py
index 5b76233..28f62b6 100644
--- a/backend/satellite_tools/test/test-errata.py
+++ b/backend/satellite_tools/test/test-errata.py
@@ -19,7 +19,7 @@ if __name__ == '__main__':
#s = StreamConnection("http://rhnapp.webdev-colo.redhat.com/SAT-DUMP",
#s = StreamConnection("http://roadrunner.devel.redhat.com/SAT-DUMP",
#s = StreamConnection("http://coyote.devel.redhat.com/SAT-DUMP",
- xml_dump_version="2.0")
+ )
systemid = open("systemid-satellite-live").read()
f = s.dump.errata(systemid, ["rhn-erratum-1018"])
print f.read()
commit 8940ec1ba2a8c4d5e1932516b06b0a1c6921f800
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Wed Jan 6 12:08:51 2010 +0100
code cleanup - xml_dump_version in this class (nor its childs) is never used
diff --git a/backend/satellite_tools/exporter/exporter.py b/backend/satellite_tools/exporter/exporter.py
index 1360097..ce5e4f7 100644
--- a/backend/satellite_tools/exporter/exporter.py
+++ b/backend/satellite_tools/exporter/exporter.py
@@ -148,7 +148,6 @@ def all_channels():
class Dumper:
- xml_dump_version = "2.0"
buffer_size = 65536
def __init__(self, server_url, actions, compression=9, options=None):
commit 7de1e3adbd3ec43bcc0db243a288b443bebe231f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 5 10:20:36 2010 +0100
convert comments to docstring
diff --git a/backend/common/rhnConfig.py b/backend/common/rhnConfig.py
index c437595..46b65ba 100644
--- a/backend/common/rhnConfig.py
+++ b/backend/common/rhnConfig.py
@@ -41,13 +41,6 @@ class ConfigParserError(Exception):
pass
-# Main options class
-# FIXME: needs an overhaul. Way way way too complex.
-#
-# Singleton-esque:
-# The basic idea is to share the important pieces of information - the
-# component and the configuration tree - across all instances of this
-# class.
# TODO: need to be able to specify "" component and parse all files in
# the directory and form a _complete_ mapping structure.
# Or, if that is too difficult, take in a list of components...
@@ -55,10 +48,12 @@ class ConfigParserError(Exception):
# of config options, compare to the default options and write to
# /etc/rhn/rhn.conf if those options differ at all.
# XXX: almost done
-
-
class RHNOptions:
-
+ """ Main options class
+ The basic idea is to share the important pieces of information - the
+ component and the configuration tree - across all instances of this
+ class.
+ """
def __init__(self, component=None, root=None, file=None):
self.__component = None
# Defaults for each option, keyed on tuples
commit 665f3c6e5a0135ccb2e4599d24801bfa21f60cbc
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 5 10:17:24 2010 +0100
code cleanup - removal of long time commented code
diff --git a/backend/common/rhnCache.py b/backend/common/rhnCache.py
index 5e9d612..7de54ae 100644
--- a/backend/common/rhnCache.py
+++ b/backend/common/rhnCache.py
@@ -192,10 +192,6 @@ class LockedFile(object):
self.fd.close()
self.closed = True
-# def __del__(self):
-# if not self.closed:
-# self.close()
-
def __getattr__(self, x):
return getattr(self.fd, x)
commit fba08b9117bc243b82301269d15f2b7ca9ba172f
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 5 10:16:37 2010 +0100
convert comments to docstring
diff --git a/backend/common/rhnCache.py b/backend/common/rhnCache.py
index 8c4ad37..5e9d612 100644
--- a/backend/common/rhnCache.py
+++ b/backend/common/rhnCache.py
@@ -106,11 +106,13 @@ class UnreadableFileError(Exception):
pass
-# This function returns a file descriptor for the open file fname
-# If the file is already there, it is truncated
-# otherwise, all the directories up to it are created and the file is created
-# as well
def _safe_create(fname, user, group, mode):
+ """ This function returns a file descriptor for the open file fname
+ If the file is already there, it is truncated
+ otherwise, all the directories up to it are created and the file is created
+ as well.
+ """
+
# There can be race conditions between the moment we check for the file
# existence and when we actually create it, so retry if something fails
tries = 5
14 years, 3 months
2 commits - web/modules
by Jan Pazdziora
web/modules/grail/Grail/Canvas.pm | 2 +-
web/modules/grail/Grail/Component.pm | 2 +-
web/modules/grail/Grail/Frame.pm | 2 +-
web/modules/pxt/PXT/ApacheHandler.pm | 2 +-
web/modules/pxt/PXT/Request.pm | 2 +-
web/modules/pxt/PXT/Trace.pm | 2 +-
web/modules/pxt/PXT/Utils.pm | 2 +-
web/modules/rhn/RHN/Action.pm | 2 +-
web/modules/rhn/RHN/AppInstall/ACL.pm | 2 +-
web/modules/rhn/RHN/AppInstall/ActionHandler.pm | 2 +-
web/modules/rhn/RHN/AppInstall/Process.pm | 2 +-
web/modules/rhn/RHN/AppInstall/Process/Step/Action.pm | 2 +-
web/modules/rhn/RHN/AppInstall/Process/Step/Redirect.pm | 2 +-
web/modules/rhn/RHN/AppInstall/Process/Step/Requirements.pm | 2 +-
web/modules/rhn/RHN/AppInstall/RequirementHandler.pm | 2 +-
web/modules/rhn/RHN/AppInstall/Session.pm | 2 +-
web/modules/rhn/RHN/Channel.pm | 2 +-
web/modules/rhn/RHN/DB.pm | 2 +-
web/modules/rhn/RHN/DB/Action.pm | 2 +-
web/modules/rhn/RHN/DB/AppInstall/Session.pm | 2 +-
web/modules/rhn/RHN/DB/Channel.pm | 2 +-
web/modules/rhn/RHN/DB/ChannelEditor.pm | 2 +-
web/modules/rhn/RHN/DB/Command.pm | 4 ++--
web/modules/rhn/RHN/DB/ConfigChannel.pm | 2 +-
web/modules/rhn/RHN/DB/ConfigRevision.pm | 2 +-
web/modules/rhn/RHN/DB/CryptoKey.pm | 2 +-
web/modules/rhn/RHN/DB/DataSource.pm | 2 +-
web/modules/rhn/RHN/DB/EmailAddress.pm | 2 +-
web/modules/rhn/RHN/DB/Entitlements.pm | 2 +-
web/modules/rhn/RHN/DB/Errata.pm | 2 +-
web/modules/rhn/RHN/DB/ErrataEditor.pm | 2 +-
web/modules/rhn/RHN/DB/FileList.pm | 2 +-
web/modules/rhn/RHN/DB/KSTree.pm | 2 +-
web/modules/rhn/RHN/DB/Kickstart.pm | 2 +-
web/modules/rhn/RHN/DB/Kickstart/Session.pm | 2 +-
web/modules/rhn/RHN/DB/Notes.pm | 2 +-
web/modules/rhn/RHN/DB/Org.pm | 2 +-
web/modules/rhn/RHN/DB/Package.pm | 2 +-
web/modules/rhn/RHN/DB/Probe.pm | 4 ++--
web/modules/rhn/RHN/DB/Profile.pm | 2 +-
web/modules/rhn/RHN/DB/SatCluster.pm | 4 ++--
web/modules/rhn/RHN/DB/SatInstall.pm | 2 +-
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
web/modules/rhn/RHN/DB/Server.pm | 2 +-
web/modules/rhn/RHN/DB/Server/CdDevice.pm | 2 +-
web/modules/rhn/RHN/DB/Server/HwDevice.pm | 2 +-
web/modules/rhn/RHN/DB/Server/NetInfo.pm | 2 +-
web/modules/rhn/RHN/DB/Server/NetInterface.pm | 2 +-
web/modules/rhn/RHN/DB/Server/StorageDevice.pm | 2 +-
web/modules/rhn/RHN/DB/ServerActions.pm | 2 +-
web/modules/rhn/RHN/DB/ServerGroup.pm | 2 +-
web/modules/rhn/RHN/DB/Set.pm | 2 +-
web/modules/rhn/RHN/DB/TableClass.pm | 2 +-
web/modules/rhn/RHN/DB/TemplateString.pm | 2 +-
web/modules/rhn/RHN/DB/TinyURL.pm | 2 +-
web/modules/rhn/RHN/DB/Token.pm | 2 +-
web/modules/rhn/RHN/DB/User.pm | 2 +-
web/modules/rhn/RHN/DataSource.pm | 2 +-
web/modules/rhn/RHN/Date.pm | 2 +-
web/modules/rhn/RHN/Entitlements.pm | 2 +-
web/modules/rhn/RHN/Errata.pm | 2 +-
web/modules/rhn/RHN/Exception.pm | 2 +-
web/modules/rhn/RHN/Form.pm | 2 +-
web/modules/rhn/RHN/Form/Response.pm | 2 +-
web/modules/rhn/RHN/Kickstart.pm | 2 +-
web/modules/rhn/RHN/Kickstart/IPRange.pm | 2 +-
web/modules/rhn/RHN/Kickstart/Post.pm | 2 +-
web/modules/rhn/RHN/Kickstart/Pre.pm | 2 +-
web/modules/rhn/RHN/Mail.pm | 2 +-
web/modules/rhn/RHN/Org.pm | 2 +-
web/modules/rhn/RHN/Package.pm | 2 +-
web/modules/rhn/RHN/Postal.pm | 2 +-
web/modules/rhn/RHN/ProxyInstall.pm | 2 +-
web/modules/rhn/RHN/SatInstall.pm | 2 +-
web/modules/rhn/RHN/SatelliteCert.pm | 2 +-
web/modules/rhn/RHN/SearchTypes.pm | 2 +-
web/modules/rhn/RHN/Server.pm | 2 +-
web/modules/rhn/RHN/ServerGroup.pm | 2 +-
web/modules/rhn/RHN/ServerNotes.pm | 2 +-
web/modules/rhn/RHN/SystemSnapshot.pm | 2 +-
web/modules/rhn/RHN/Tag.pm | 2 +-
web/modules/rhn/RHN/TokenGen/Local.pm | 2 +-
web/modules/sniglets/Sniglets/ActivationKeys.pm | 2 +-
web/modules/sniglets/Sniglets/AppInstall.pm | 2 +-
web/modules/sniglets/Sniglets/Channel.pm | 2 +-
web/modules/sniglets/Sniglets/ChannelEditor.pm | 2 +-
web/modules/sniglets/Sniglets/ConfigManagement.pm | 2 +-
web/modules/sniglets/Sniglets/Downloads.pm | 2 +-
web/modules/sniglets/Sniglets/Errata.pm | 2 +-
web/modules/sniglets/Sniglets/ErrataEditor.pm | 2 +-
web/modules/sniglets/Sniglets/Forms.pm | 2 +-
web/modules/sniglets/Sniglets/HTML.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/FileList.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/GeneralList.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/List.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 2 +-
web/modules/sniglets/Sniglets/ListView/Style.pm | 2 +-
web/modules/sniglets/Sniglets/Lists.pm | 2 +-
web/modules/sniglets/Sniglets/Navi/Style.pm | 2 +-
web/modules/sniglets/Sniglets/Packages.pm | 2 +-
web/modules/sniglets/Sniglets/Probes.pm | 2 +-
web/modules/sniglets/Sniglets/Profiles.pm | 2 +-
web/modules/sniglets/Sniglets/PublicErrata.pm | 2 +-
web/modules/sniglets/Sniglets/Search.pm | 2 +-
web/modules/sniglets/Sniglets/ServerActions.pm | 2 +-
web/modules/sniglets/Sniglets/ServerGroup.pm | 2 +-
web/modules/sniglets/Sniglets/ServerNotes.pm | 2 +-
web/modules/sniglets/Sniglets/Servers.pm | 2 +-
web/modules/sniglets/Sniglets/Sets.pm | 2 +-
web/modules/sniglets/Sniglets/Users.pm | 2 +-
web/modules/sniglets/Sniglets/Utils.pm | 2 +-
112 files changed, 115 insertions(+), 115 deletions(-)
New commits:
commit c03a90ecab462078e9dc270fbe1f1e7988a6cdb0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 6 09:23:41 2010 +0100
Update copyright in web subtree for files changed in 2009.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 5867931..2da2193 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/Command.pm b/web/modules/rhn/RHN/DB/Command.pm
index 19efd35..313905d 100644
--- a/web/modules/rhn/RHN/DB/Command.pm
+++ b/web/modules/rhn/RHN/DB/Command.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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
@@ -243,7 +243,7 @@ Supported versions of monitored software.
=head1 COPYRIGHT
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
+Copyright (c) 2004-2009, Red Hat, Inc. All rights reserved
=cut
diff --git a/web/modules/rhn/RHN/DB/EmailAddress.pm b/web/modules/rhn/RHN/DB/EmailAddress.pm
index 740b9de..14bd91e 100644
--- a/web/modules/rhn/RHN/DB/EmailAddress.pm
+++ b/web/modules/rhn/RHN/DB/EmailAddress.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 07f704e..0154cd4 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ActivationKeys.pm b/web/modules/sniglets/Sniglets/ActivationKeys.pm
index 076ae95..4633d90 100644
--- a/web/modules/sniglets/Sniglets/ActivationKeys.pm
+++ b/web/modules/sniglets/Sniglets/ActivationKeys.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/AppInstall.pm b/web/modules/sniglets/Sniglets/AppInstall.pm
index 127fb81..16da04d 100644
--- a/web/modules/sniglets/Sniglets/AppInstall.pm
+++ b/web/modules/sniglets/Sniglets/AppInstall.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ChannelEditor.pm b/web/modules/sniglets/Sniglets/ChannelEditor.pm
index 3285543..7aaa40e 100644
--- a/web/modules/sniglets/Sniglets/ChannelEditor.pm
+++ b/web/modules/sniglets/Sniglets/ChannelEditor.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ConfigManagement.pm b/web/modules/sniglets/Sniglets/ConfigManagement.pm
index b12bc8d..f2f33d8 100644
--- a/web/modules/sniglets/Sniglets/ConfigManagement.pm
+++ b/web/modules/sniglets/Sniglets/ConfigManagement.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Downloads.pm b/web/modules/sniglets/Sniglets/Downloads.pm
index 61f033b..1624a61 100644
--- a/web/modules/sniglets/Sniglets/Downloads.pm
+++ b/web/modules/sniglets/Sniglets/Downloads.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
index 038aa4e..dd65282 100644
--- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/FileList.pm b/web/modules/sniglets/Sniglets/ListView/FileList.pm
index ff4e308..106a7d6 100644
--- a/web/modules/sniglets/Sniglets/ListView/FileList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/FileList.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/GeneralList.pm b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
index a1d85be..e27785e 100644
--- a/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/GeneralList.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/List.pm b/web/modules/sniglets/Sniglets/ListView/List.pm
index 5b767f7..041cd46 100644
--- a/web/modules/sniglets/Sniglets/ListView/List.pm
+++ b/web/modules/sniglets/Sniglets/ListView/List.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 19fb352..69901c5 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ListView/Style.pm b/web/modules/sniglets/Sniglets/ListView/Style.pm
index 0de160c..a55a600 100644
--- a/web/modules/sniglets/Sniglets/ListView/Style.pm
+++ b/web/modules/sniglets/Sniglets/ListView/Style.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Lists.pm b/web/modules/sniglets/Sniglets/Lists.pm
index bac4c86..2f23688 100644
--- a/web/modules/sniglets/Sniglets/Lists.pm
+++ b/web/modules/sniglets/Sniglets/Lists.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 9ff3869..125f56f 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/PublicErrata.pm b/web/modules/sniglets/Sniglets/PublicErrata.pm
index 7ee91ea..fbcf52f 100644
--- a/web/modules/sniglets/Sniglets/PublicErrata.pm
+++ b/web/modules/sniglets/Sniglets/PublicErrata.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Search.pm b/web/modules/sniglets/Sniglets/Search.pm
index 4073319..93d148c 100644
--- a/web/modules/sniglets/Sniglets/Search.pm
+++ b/web/modules/sniglets/Sniglets/Search.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ServerActions.pm b/web/modules/sniglets/Sniglets/ServerActions.pm
index f60c7c9..93a8d2c 100644
--- a/web/modules/sniglets/Sniglets/ServerActions.pm
+++ b/web/modules/sniglets/Sniglets/ServerActions.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/ServerNotes.pm b/web/modules/sniglets/Sniglets/ServerNotes.pm
index 4704ca7..a6fc1b0 100644
--- a/web/modules/sniglets/Sniglets/ServerNotes.pm
+++ b/web/modules/sniglets/Sniglets/ServerNotes.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Sets.pm b/web/modules/sniglets/Sniglets/Sets.pm
index a4672e9..47ce191 100644
--- a/web/modules/sniglets/Sniglets/Sets.pm
+++ b/web/modules/sniglets/Sniglets/Sets.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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/sniglets/Sniglets/Utils.pm b/web/modules/sniglets/Sniglets/Utils.pm
index 1108b56..3c2e25c 100644
--- a/web/modules/sniglets/Sniglets/Utils.pm
+++ b/web/modules/sniglets/Sniglets/Utils.pm
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2008--2009 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
commit 90331cd1fb2be7b718041f8664273b6b72118a9e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Jan 6 09:21:11 2010 +0100
Update copyright in web subtree for files changed in 2010.
diff --git a/web/modules/grail/Grail/Canvas.pm b/web/modules/grail/Grail/Canvas.pm
index b43ce1e..f660600 100644
--- a/web/modules/grail/Grail/Canvas.pm
+++ b/web/modules/grail/Grail/Canvas.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/grail/Grail/Component.pm b/web/modules/grail/Grail/Component.pm
index 56a2c2d..2592e89 100644
--- a/web/modules/grail/Grail/Component.pm
+++ b/web/modules/grail/Grail/Component.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/pxt/PXT/ApacheHandler.pm b/web/modules/pxt/PXT/ApacheHandler.pm
index 2fdfaa9..b8d2433 100644
--- a/web/modules/pxt/PXT/ApacheHandler.pm
+++ b/web/modules/pxt/PXT/ApacheHandler.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/pxt/PXT/Request.pm b/web/modules/pxt/PXT/Request.pm
index 2a1f0d0..f62e605 100644
--- a/web/modules/pxt/PXT/Request.pm
+++ b/web/modules/pxt/PXT/Request.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/pxt/PXT/Trace.pm b/web/modules/pxt/PXT/Trace.pm
index 3a0c46c..3eae43a 100644
--- a/web/modules/pxt/PXT/Trace.pm
+++ b/web/modules/pxt/PXT/Trace.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/pxt/PXT/Utils.pm b/web/modules/pxt/PXT/Utils.pm
index b93f6ec..3a6b293 100644
--- a/web/modules/pxt/PXT/Utils.pm
+++ b/web/modules/pxt/PXT/Utils.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/Action.pm b/web/modules/rhn/RHN/Action.pm
index 43af538..10cc3e5 100644
--- a/web/modules/rhn/RHN/Action.pm
+++ b/web/modules/rhn/RHN/Action.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/AppInstall/ACL.pm b/web/modules/rhn/RHN/AppInstall/ACL.pm
index de85089..188bc7f 100644
--- a/web/modules/rhn/RHN/AppInstall/ACL.pm
+++ b/web/modules/rhn/RHN/AppInstall/ACL.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/AppInstall/ActionHandler.pm b/web/modules/rhn/RHN/AppInstall/ActionHandler.pm
index 52d0d2b..1baf478 100644
--- a/web/modules/rhn/RHN/AppInstall/ActionHandler.pm
+++ b/web/modules/rhn/RHN/AppInstall/ActionHandler.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/AppInstall/Process.pm b/web/modules/rhn/RHN/AppInstall/Process.pm
index 188c238..8a6fc70 100644
--- a/web/modules/rhn/RHN/AppInstall/Process.pm
+++ b/web/modules/rhn/RHN/AppInstall/Process.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/AppInstall/Process/Step/Action.pm b/web/modules/rhn/RHN/AppInstall/Process/Step/Action.pm
index 4037eda..43bf355 100644
--- a/web/modules/rhn/RHN/AppInstall/Process/Step/Action.pm
+++ b/web/modules/rhn/RHN/AppInstall/Process/Step/Action.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/AppInstall/Process/Step/Redirect.pm b/web/modules/rhn/RHN/AppInstall/Process/Step/Redirect.pm
index ba8cb51..a1da3a8 100644
--- a/web/modules/rhn/RHN/AppInstall/Process/Step/Redirect.pm
+++ b/web/modules/rhn/RHN/AppInstall/Process/Step/Redirect.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/AppInstall/Process/Step/Requirements.pm b/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements.pm
index 912d03c..33070e9 100644
--- a/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements.pm
+++ b/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements.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/AppInstall/RequirementHandler.pm b/web/modules/rhn/RHN/AppInstall/RequirementHandler.pm
index 40e099f..ebbf5dd 100644
--- a/web/modules/rhn/RHN/AppInstall/RequirementHandler.pm
+++ b/web/modules/rhn/RHN/AppInstall/RequirementHandler.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/AppInstall/Session.pm b/web/modules/rhn/RHN/AppInstall/Session.pm
index 8abe2a4..ee05d77 100644
--- a/web/modules/rhn/RHN/AppInstall/Session.pm
+++ b/web/modules/rhn/RHN/AppInstall/Session.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/Channel.pm b/web/modules/rhn/RHN/Channel.pm
index e95d86f..ccd3957 100644
--- a/web/modules/rhn/RHN/Channel.pm
+++ b/web/modules/rhn/RHN/Channel.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.pm b/web/modules/rhn/RHN/DB.pm
index af7c0e5..d080e08 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.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/Action.pm b/web/modules/rhn/RHN/DB/Action.pm
index a23d56f..9290422 100644
--- a/web/modules/rhn/RHN/DB/Action.pm
+++ b/web/modules/rhn/RHN/DB/Action.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/AppInstall/Session.pm b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
index 1940f3b..07d032a 100644
--- a/web/modules/rhn/RHN/DB/AppInstall/Session.pm
+++ b/web/modules/rhn/RHN/DB/AppInstall/Session.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/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 309d399..9120b41 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.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/ChannelEditor.pm b/web/modules/rhn/RHN/DB/ChannelEditor.pm
index 5ea0bff..197b018 100644
--- a/web/modules/rhn/RHN/DB/ChannelEditor.pm
+++ b/web/modules/rhn/RHN/DB/ChannelEditor.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/ConfigChannel.pm b/web/modules/rhn/RHN/DB/ConfigChannel.pm
index 1c808af..8d29009 100644
--- a/web/modules/rhn/RHN/DB/ConfigChannel.pm
+++ b/web/modules/rhn/RHN/DB/ConfigChannel.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/ConfigRevision.pm b/web/modules/rhn/RHN/DB/ConfigRevision.pm
index 3d720f0..3a46751 100644
--- a/web/modules/rhn/RHN/DB/ConfigRevision.pm
+++ b/web/modules/rhn/RHN/DB/ConfigRevision.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/CryptoKey.pm b/web/modules/rhn/RHN/DB/CryptoKey.pm
index 7f1d55d..490eede 100644
--- a/web/modules/rhn/RHN/DB/CryptoKey.pm
+++ b/web/modules/rhn/RHN/DB/CryptoKey.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/DataSource.pm b/web/modules/rhn/RHN/DB/DataSource.pm
index f2bc749..9c130ae 100644
--- a/web/modules/rhn/RHN/DB/DataSource.pm
+++ b/web/modules/rhn/RHN/DB/DataSource.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/Entitlements.pm b/web/modules/rhn/RHN/DB/Entitlements.pm
index ef5dccf..e27b1f1 100644
--- a/web/modules/rhn/RHN/DB/Entitlements.pm
+++ b/web/modules/rhn/RHN/DB/Entitlements.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/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index 89ec9e3..d87fa90 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.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/FileList.pm b/web/modules/rhn/RHN/DB/FileList.pm
index 925f5e3..52dde20 100644
--- a/web/modules/rhn/RHN/DB/FileList.pm
+++ b/web/modules/rhn/RHN/DB/FileList.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/KSTree.pm b/web/modules/rhn/RHN/DB/KSTree.pm
index 454218e..dd605aa 100644
--- a/web/modules/rhn/RHN/DB/KSTree.pm
+++ b/web/modules/rhn/RHN/DB/KSTree.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/Kickstart.pm b/web/modules/rhn/RHN/DB/Kickstart.pm
index de97640..09e0db9 100644
--- a/web/modules/rhn/RHN/DB/Kickstart.pm
+++ b/web/modules/rhn/RHN/DB/Kickstart.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/Kickstart/Session.pm b/web/modules/rhn/RHN/DB/Kickstart/Session.pm
index 4bbd615..b53d287 100644
--- a/web/modules/rhn/RHN/DB/Kickstart/Session.pm
+++ b/web/modules/rhn/RHN/DB/Kickstart/Session.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/Notes.pm b/web/modules/rhn/RHN/DB/Notes.pm
index de55db0..ee80260 100644
--- a/web/modules/rhn/RHN/DB/Notes.pm
+++ b/web/modules/rhn/RHN/DB/Notes.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/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index a4039fb..c57ecd7 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.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/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 7e068ac..309393b 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.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/Probe.pm b/web/modules/rhn/RHN/DB/Probe.pm
index 2008a8c..0262300 100644
--- a/web/modules/rhn/RHN/DB/Probe.pm
+++ b/web/modules/rhn/RHN/DB/Probe.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
@@ -340,7 +340,7 @@ L<OTHER_MODULE>, L<ANOTHER_MODULE>
=head1 COPYRIGHT
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
+Copyright (c) 2004-2010, Red Hat, Inc. All rights reserved
=cut
diff --git a/web/modules/rhn/RHN/DB/Profile.pm b/web/modules/rhn/RHN/DB/Profile.pm
index 1cbff0e..dcee858 100644
--- a/web/modules/rhn/RHN/DB/Profile.pm
+++ b/web/modules/rhn/RHN/DB/Profile.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/SatCluster.pm b/web/modules/rhn/RHN/DB/SatCluster.pm
index 9822dbf..0045813 100644
--- a/web/modules/rhn/RHN/DB/SatCluster.pm
+++ b/web/modules/rhn/RHN/DB/SatCluster.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
@@ -421,7 +421,7 @@ Method to simply grab the scout_shared_key for a given sat_cluster_id
=head1 COPYRIGHT
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
+Copyright (c) 2004-2010, Red Hat, Inc. All rights reserved
=cut
diff --git a/web/modules/rhn/RHN/DB/SatInstall.pm b/web/modules/rhn/RHN/DB/SatInstall.pm
index 7d4e3c3..b6b4a8d 100644
--- a/web/modules/rhn/RHN/DB/SatInstall.pm
+++ b/web/modules/rhn/RHN/DB/SatInstall.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/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 07b31b0..d7b62d2 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.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/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 1ab7c33..975d925 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.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/Server/CdDevice.pm b/web/modules/rhn/RHN/DB/Server/CdDevice.pm
index 82fa6a6..1ad537d 100644
--- a/web/modules/rhn/RHN/DB/Server/CdDevice.pm
+++ b/web/modules/rhn/RHN/DB/Server/CdDevice.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/Server/HwDevice.pm b/web/modules/rhn/RHN/DB/Server/HwDevice.pm
index 4a87b4d..ecceede 100644
--- a/web/modules/rhn/RHN/DB/Server/HwDevice.pm
+++ b/web/modules/rhn/RHN/DB/Server/HwDevice.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/Server/NetInfo.pm b/web/modules/rhn/RHN/DB/Server/NetInfo.pm
index ff70e5c..756d455 100644
--- a/web/modules/rhn/RHN/DB/Server/NetInfo.pm
+++ b/web/modules/rhn/RHN/DB/Server/NetInfo.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/Server/NetInterface.pm b/web/modules/rhn/RHN/DB/Server/NetInterface.pm
index 1a2a680..35422a6 100644
--- a/web/modules/rhn/RHN/DB/Server/NetInterface.pm
+++ b/web/modules/rhn/RHN/DB/Server/NetInterface.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/Server/StorageDevice.pm b/web/modules/rhn/RHN/DB/Server/StorageDevice.pm
index 281bf7d..ea081f1 100644
--- a/web/modules/rhn/RHN/DB/Server/StorageDevice.pm
+++ b/web/modules/rhn/RHN/DB/Server/StorageDevice.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/ServerActions.pm b/web/modules/rhn/RHN/DB/ServerActions.pm
index 0ccceed..2a09d21 100644
--- a/web/modules/rhn/RHN/DB/ServerActions.pm
+++ b/web/modules/rhn/RHN/DB/ServerActions.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/ServerGroup.pm b/web/modules/rhn/RHN/DB/ServerGroup.pm
index db6fe27..530753c 100644
--- a/web/modules/rhn/RHN/DB/ServerGroup.pm
+++ b/web/modules/rhn/RHN/DB/ServerGroup.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/Set.pm b/web/modules/rhn/RHN/DB/Set.pm
index 98d89cd..51b7ca5 100644
--- a/web/modules/rhn/RHN/DB/Set.pm
+++ b/web/modules/rhn/RHN/DB/Set.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/TableClass.pm b/web/modules/rhn/RHN/DB/TableClass.pm
index ebfd4b7..c0ea66f 100644
--- a/web/modules/rhn/RHN/DB/TableClass.pm
+++ b/web/modules/rhn/RHN/DB/TableClass.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/TemplateString.pm b/web/modules/rhn/RHN/DB/TemplateString.pm
index 8a1b892..5e20803 100644
--- a/web/modules/rhn/RHN/DB/TemplateString.pm
+++ b/web/modules/rhn/RHN/DB/TemplateString.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/TinyURL.pm b/web/modules/rhn/RHN/DB/TinyURL.pm
index 1fabbd8..4ae6938 100644
--- a/web/modules/rhn/RHN/DB/TinyURL.pm
+++ b/web/modules/rhn/RHN/DB/TinyURL.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/Token.pm b/web/modules/rhn/RHN/DB/Token.pm
index 240652e..c007d39 100644
--- a/web/modules/rhn/RHN/DB/Token.pm
+++ b/web/modules/rhn/RHN/DB/Token.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/User.pm b/web/modules/rhn/RHN/DB/User.pm
index d6193da..eaac760 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.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/DataSource.pm b/web/modules/rhn/RHN/DataSource.pm
index 569fc81..c938ca7 100644
--- a/web/modules/rhn/RHN/DataSource.pm
+++ b/web/modules/rhn/RHN/DataSource.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/Date.pm b/web/modules/rhn/RHN/Date.pm
index 2af8a5b..5df2daa 100644
--- a/web/modules/rhn/RHN/Date.pm
+++ b/web/modules/rhn/RHN/Date.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/Entitlements.pm b/web/modules/rhn/RHN/Entitlements.pm
index 535d074..9681feb 100644
--- a/web/modules/rhn/RHN/Entitlements.pm
+++ b/web/modules/rhn/RHN/Entitlements.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/Errata.pm b/web/modules/rhn/RHN/Errata.pm
index b897fe9..c87b2bb 100644
--- a/web/modules/rhn/RHN/Errata.pm
+++ b/web/modules/rhn/RHN/Errata.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/Exception.pm b/web/modules/rhn/RHN/Exception.pm
index f6a711f..8c3fce1 100644
--- a/web/modules/rhn/RHN/Exception.pm
+++ b/web/modules/rhn/RHN/Exception.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/Form.pm b/web/modules/rhn/RHN/Form.pm
index 363baff..453156e 100644
--- a/web/modules/rhn/RHN/Form.pm
+++ b/web/modules/rhn/RHN/Form.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/Form/Response.pm b/web/modules/rhn/RHN/Form/Response.pm
index 3c4450a..5ff8f88 100644
--- a/web/modules/rhn/RHN/Form/Response.pm
+++ b/web/modules/rhn/RHN/Form/Response.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/Kickstart.pm b/web/modules/rhn/RHN/Kickstart.pm
index b241029..11f7b92 100644
--- a/web/modules/rhn/RHN/Kickstart.pm
+++ b/web/modules/rhn/RHN/Kickstart.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/Kickstart/IPRange.pm b/web/modules/rhn/RHN/Kickstart/IPRange.pm
index 62adfa5..327bfd4 100644
--- a/web/modules/rhn/RHN/Kickstart/IPRange.pm
+++ b/web/modules/rhn/RHN/Kickstart/IPRange.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/Kickstart/Post.pm b/web/modules/rhn/RHN/Kickstart/Post.pm
index 2837862..14c3f4f 100644
--- a/web/modules/rhn/RHN/Kickstart/Post.pm
+++ b/web/modules/rhn/RHN/Kickstart/Post.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/Kickstart/Pre.pm b/web/modules/rhn/RHN/Kickstart/Pre.pm
index a73c408..65dff45 100644
--- a/web/modules/rhn/RHN/Kickstart/Pre.pm
+++ b/web/modules/rhn/RHN/Kickstart/Pre.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/Mail.pm b/web/modules/rhn/RHN/Mail.pm
index a4cd355..38cbbc2 100644
--- a/web/modules/rhn/RHN/Mail.pm
+++ b/web/modules/rhn/RHN/Mail.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/Org.pm b/web/modules/rhn/RHN/Org.pm
index 2a2e29c..5b579a9 100644
--- a/web/modules/rhn/RHN/Org.pm
+++ b/web/modules/rhn/RHN/Org.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/Package.pm b/web/modules/rhn/RHN/Package.pm
index b9b2613..9a87884 100644
--- a/web/modules/rhn/RHN/Package.pm
+++ b/web/modules/rhn/RHN/Package.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/Postal.pm b/web/modules/rhn/RHN/Postal.pm
index 2fdc10b..487bdf3 100644
--- a/web/modules/rhn/RHN/Postal.pm
+++ b/web/modules/rhn/RHN/Postal.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/ProxyInstall.pm b/web/modules/rhn/RHN/ProxyInstall.pm
index 8cfe735..e21f5eb 100644
--- a/web/modules/rhn/RHN/ProxyInstall.pm
+++ b/web/modules/rhn/RHN/ProxyInstall.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/SatInstall.pm b/web/modules/rhn/RHN/SatInstall.pm
index 814ee6a..f83b122 100644
--- a/web/modules/rhn/RHN/SatInstall.pm
+++ b/web/modules/rhn/RHN/SatInstall.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/SatelliteCert.pm b/web/modules/rhn/RHN/SatelliteCert.pm
index c65f63a..449d524 100644
--- a/web/modules/rhn/RHN/SatelliteCert.pm
+++ b/web/modules/rhn/RHN/SatelliteCert.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/SearchTypes.pm b/web/modules/rhn/RHN/SearchTypes.pm
index 7b2fed5..5489da1 100644
--- a/web/modules/rhn/RHN/SearchTypes.pm
+++ b/web/modules/rhn/RHN/SearchTypes.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/Server.pm b/web/modules/rhn/RHN/Server.pm
index bbe3947..43d02f6 100644
--- a/web/modules/rhn/RHN/Server.pm
+++ b/web/modules/rhn/RHN/Server.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/ServerGroup.pm b/web/modules/rhn/RHN/ServerGroup.pm
index 01baf09..07bc0a2 100644
--- a/web/modules/rhn/RHN/ServerGroup.pm
+++ b/web/modules/rhn/RHN/ServerGroup.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/ServerNotes.pm b/web/modules/rhn/RHN/ServerNotes.pm
index 0929ceb..65e8952 100644
--- a/web/modules/rhn/RHN/ServerNotes.pm
+++ b/web/modules/rhn/RHN/ServerNotes.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/SystemSnapshot.pm b/web/modules/rhn/RHN/SystemSnapshot.pm
index 5043bc3..6350ea9 100644
--- a/web/modules/rhn/RHN/SystemSnapshot.pm
+++ b/web/modules/rhn/RHN/SystemSnapshot.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/Tag.pm b/web/modules/rhn/RHN/Tag.pm
index 4ac3735..bc60d93 100644
--- a/web/modules/rhn/RHN/Tag.pm
+++ b/web/modules/rhn/RHN/Tag.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/TokenGen/Local.pm b/web/modules/rhn/RHN/TokenGen/Local.pm
index e0c13bd..e571df5 100644
--- a/web/modules/rhn/RHN/TokenGen/Local.pm
+++ b/web/modules/rhn/RHN/TokenGen/Local.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/sniglets/Sniglets/Channel.pm b/web/modules/sniglets/Sniglets/Channel.pm
index c118460..6454cb4 100644
--- a/web/modules/sniglets/Sniglets/Channel.pm
+++ b/web/modules/sniglets/Sniglets/Channel.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/sniglets/Sniglets/Errata.pm b/web/modules/sniglets/Sniglets/Errata.pm
index a7a33d9..cffb439 100644
--- a/web/modules/sniglets/Sniglets/Errata.pm
+++ b/web/modules/sniglets/Sniglets/Errata.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/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 75ab75f..193c659 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.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/sniglets/Sniglets/Forms.pm b/web/modules/sniglets/Sniglets/Forms.pm
index 447b23d..ad7301d 100644
--- a/web/modules/sniglets/Sniglets/Forms.pm
+++ b/web/modules/sniglets/Sniglets/Forms.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/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index c1fe420..813673c 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.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/sniglets/Sniglets/Navi/Style.pm b/web/modules/sniglets/Sniglets/Navi/Style.pm
index 5f3d62c..9abd8a4 100644
--- a/web/modules/sniglets/Sniglets/Navi/Style.pm
+++ b/web/modules/sniglets/Sniglets/Navi/Style.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/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 2d63df8..c2c67a5 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.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/sniglets/Sniglets/Probes.pm b/web/modules/sniglets/Sniglets/Probes.pm
index 89ae68f..c2ac835 100644
--- a/web/modules/sniglets/Sniglets/Probes.pm
+++ b/web/modules/sniglets/Sniglets/Probes.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/sniglets/Sniglets/ServerGroup.pm b/web/modules/sniglets/Sniglets/ServerGroup.pm
index bf1b234..7723e60 100644
--- a/web/modules/sniglets/Sniglets/ServerGroup.pm
+++ b/web/modules/sniglets/Sniglets/ServerGroup.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/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index d383b5e..300fcfe 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.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/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index eec09c4..df2c1bc 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.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
14 years, 3 months
4 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/SatelliteCert.pm | 5 -----
web/modules/rhn/RHN/Server.pm | 8 --------
web/modules/rhn/RHN/Tag.pm | 8 --------
web/modules/sniglets/Sniglets/Errata.pm | 5 -----
4 files changed, 26 deletions(-)
New commits:
commit 1d4256836e06444f9e8966c878f697ab38c78f18
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:44:09 2010 +0100
dump_time not called from anywhere, removing.
diff --git a/web/modules/sniglets/Sniglets/Errata.pm b/web/modules/sniglets/Sniglets/Errata.pm
index 60cd9e6..a7a33d9 100644
--- a/web/modules/sniglets/Sniglets/Errata.pm
+++ b/web/modules/sniglets/Sniglets/Errata.pm
@@ -19,7 +19,6 @@ package Sniglets::Errata;
use Carp;
use Data::Dumper;
-use Time::HiRes;
use File::Spec;
use RHN::Access;
@@ -30,10 +29,6 @@ use PXT::HTML;
use Sniglets::Downloads;
use RHN::Exception;
-my $ti = 1;
-my $prev_t = 0;
-sub dump_time { PXT::Debug->log(4, "[TIME] snap $ti: " . (Time::HiRes::time() - $prev_t)); $ti++; $prev_t = Time::HiRes::time(); }
-
sub register_tags {
my $class = shift;
commit dc7ca5daae2d11cf7add5edac74736655370109a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:42:42 2010 +0100
lookup_tag is not used, removing.
diff --git a/web/modules/rhn/RHN/Tag.pm b/web/modules/rhn/RHN/Tag.pm
index d080b6a..4ac3735 100644
--- a/web/modules/rhn/RHN/Tag.pm
+++ b/web/modules/rhn/RHN/Tag.pm
@@ -36,13 +36,5 @@ sub lookup {
}
}
-sub lookup_tag {
- my $class = shift;
-
- warn "deprecated use of $class->lookup_foo from (" . join(', ', caller) . "). Using $class->lookup instead\n";
-
- return $class->lookup(@_);
-}
-
1;
commit d4b29046f1a355589d8bd7ee67e1e5c9da0b57a4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:42:01 2010 +0100
lookup_server is not used, removing.
diff --git a/web/modules/rhn/RHN/Server.pm b/web/modules/rhn/RHN/Server.pm
index 06f7867..bbe3947 100644
--- a/web/modules/rhn/RHN/Server.pm
+++ b/web/modules/rhn/RHN/Server.pm
@@ -37,14 +37,6 @@ sub lookup {
}
}
-sub lookup_server {
- my $class = shift;
-
- warn "deprecated use of $class->lookup_foo from (" . join(', ', caller) . "). Using $class->lookup instead\n";
-
- return $class->lookup(@_);
-}
-
sub lookup_server_event {
my $class = shift;
my $sid = shift;
commit 09c226577280559045878f65b726db18f55abdd5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:38:39 2010 +0100
Removal of create_cert_text made current_generation unused, removing.
diff --git a/web/modules/rhn/RHN/SatelliteCert.pm b/web/modules/rhn/RHN/SatelliteCert.pm
index 05e278f..c65f63a 100644
--- a/web/modules/rhn/RHN/SatelliteCert.pm
+++ b/web/modules/rhn/RHN/SatelliteCert.pm
@@ -21,11 +21,6 @@ use RHN::Cert;
our @ISA = qw/RHN::Cert/;
-# change this when signature criteria changes
-sub current_generation {
- return 2;
-}
-
sub _init {
my $self = shift;
14 years, 3 months
14 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/AppInstall/Session.pm | 36 ----------
web/modules/rhn/RHN/DB/Channel.pm | 72 --------------------
web/modules/rhn/RHN/DB/Kickstart.pm | 32 ---------
web/modules/rhn/RHN/DB/Kickstart/Session.pm | 22 ------
web/modules/rhn/RHN/DB/Org.pm | 25 -------
web/modules/rhn/RHN/DB/Package.pm | 7 -
web/modules/rhn/RHN/DB/Server.pm | 95 ---------------------------
web/modules/rhn/RHN/DB/User.pm | 40 -----------
web/modules/rhn/RHN/Entitlements.pm | 34 ---------
9 files changed, 363 deletions(-)
New commits:
commit 219a90cae1bb630b1dbc5d3e01d6a51741aeb669
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:36:11 2010 +0100
Removing %feature_universe and %excluded_features which are used only once.
diff --git a/web/modules/rhn/RHN/Entitlements.pm b/web/modules/rhn/RHN/Entitlements.pm
index 73b8301..535d074 100644
--- a/web/modules/rhn/RHN/Entitlements.pm
+++ b/web/modules/rhn/RHN/Entitlements.pm
@@ -40,11 +40,6 @@ my %monitoring_features = map { $_ => 1 }
my %nonlinux_features = map { $_ => 1 }
qw/ftr_nonlinux_support/;
-# all features are the unique features in other FOO_features arrays
-my %feature_universe = (%updates_features, %management_features,
- %provisioning_features, %nonlinux_features,
- %monitoring_features);
-
my %entitlement_feature_map =
( none => { },
sw_mgr_entitled => { map { $_ => 1 } (keys %updates_features) },
@@ -62,10 +57,6 @@ my %entitlement_feature_map =
keys %nonlinux_features) },
);
-my %excluded_features = (nonlinux_entitled => { map { $_ => 1 }
- qw/ftr_errata_updates ftr_proxy_capable ftr_sat_capable ftr_reboot
- ftr_kickstart ftr_delta_action/ });
-
# What type of feature is this? Management, provisioning, monitoring, etc.
sub feature_type {
my $class = shift;
commit b92c71012f61aef3414f8ac4b4ce10cc1408d8db
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:33:13 2010 +0100
entitlement_grants_service not used, removing.
diff --git a/web/modules/rhn/RHN/Entitlements.pm b/web/modules/rhn/RHN/Entitlements.pm
index 37d126e..73b8301 100644
--- a/web/modules/rhn/RHN/Entitlements.pm
+++ b/web/modules/rhn/RHN/Entitlements.pm
@@ -66,31 +66,6 @@ my %excluded_features = (nonlinux_entitled => { map { $_ => 1 }
qw/ftr_errata_updates ftr_proxy_capable ftr_sat_capable ftr_reboot
ftr_kickstart ftr_delta_action/ });
-my %grant_map =
- ( none => [ ],
- sw_mgr_entitled => [ 'updates' ],
- enterprise_entitled => [ 'updates', 'management', 'monitoring' ],
- provisioning_entitled => [ 'updates', 'management', 'provisioning', 'monitoring' ],
- monitoring_entitled => [ 'monitoring' ],
- nonlinux_entitled => [ 'updates', 'management', 'provisioning', 'nonlinux' ]
- );
-my %valid_services = map { $_ => 1 } qw/updates management provisioning monitoring nonlinux/;
-
-sub entitlement_grants_service { # Need to refactor Tokens to remove this entirely
- my $class = shift;
- my $entitlement = shift;
- my $desired_service = shift;
-
- return 0 unless defined $desired_service and defined $entitlement;
-
- croak "Invalid entitlement type '$entitlement'" unless exists $grant_map{$entitlement};
- croak "Invalid service level '$desired_service'" unless exists $valid_services{$desired_service};
-
- return 1 if grep { $_ eq $desired_service } @{$grant_map{$entitlement}};
-
- return 0;
-}
-
# What type of feature is this? Management, provisioning, monitoring, etc.
sub feature_type {
my $class = shift;
commit 823fbd276bda19471515f31f3c2639f37e073b1b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:30:49 2010 +0100
Removal of Sniglets::Inspector (its disable_user_toggle_cb) made disable_user and enable_user unused, removing, as well as _change_user_state.
diff --git a/web/modules/rhn/RHN/DB/User.pm b/web/modules/rhn/RHN/DB/User.pm
index 501f883..d6193da 100644
--- a/web/modules/rhn/RHN/DB/User.pm
+++ b/web/modules/rhn/RHN/DB/User.pm
@@ -211,46 +211,6 @@ EOQ
}
-sub _change_user_state {
- my $self = shift;
- my $doer_id = shift;
- my $state_label = shift;
-
- my $transaction = shift;
-
- my $dbh = $transaction || RHN::DB->connect();
-
- my $query = <<EOQ;
-INSERT INTO rhnWebContactChangelog (id, web_contact_id, web_contact_from_id, change_state_id)
-SELECT rhn_wcon_disabled_seq.nextval, :target_id, :doer_id, id
- FROM rhnWebContactChangeState
- WHERE label = :state_label
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(target_id => $self->id, doer_id => $doer_id, state_label => $state_label);
-
- unless ($transaction) {
- $dbh->commit;
- }
-
- return $transaction;
-}
-
-sub disable_user {
- my $self = shift;
- my $doer_id = shift;
-
- return $self->_change_user_state($doer_id, 'disabled');
-}
-
-sub enable_user {
- my $self = shift;
- my $doer_id = shift;
-
- return $self->_change_user_state($doer_id, 'enabled');
-}
-
sub delete_user {
my $class = shift;
commit 4dedf5330d316113e07a9f58de59fd544c2cca11
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:25:59 2010 +0100
satellite_cert is not called, removing.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 00e4d61..1ab7c33 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -2994,12 +2994,4 @@ EOQ
}
-sub satellite_cert {
- my $self = shift;
- if (@_) {
- $self->{__cert__} = shift;
- }
- return $self->{__cert__};
-}
-
1;
commit 4380d2b2457b8c086d8554089c1e9f93538e68e1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:24:50 2010 +0100
Removal of base_entitlement_box made can_switch_base_entitlement unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 2c66a04..00e4d61 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -1785,38 +1785,6 @@ sub can_entitle_server {
return $can ? 1 : 0;
}
-sub can_switch_base_entitlement {
- my $self_or_class = shift;
- my $entitlement = shift;
-
- my $sid;
- if (ref $self_or_class) {
- $sid = $self_or_class->id;
- }
- else {
- $sid = shift;
- }
-
- my $dbh = RHN::DB->connect;
- my $can = 0;
-
- eval {
- $can = $dbh->call_function('rhn_entitlements.can_switch_base', $sid, $entitlement);
- };
-
- if ($@) {
- my $E = $@;
-
- # if it's anything other not function not returning a value, toss
- # the exception further up the chain...
- unless ($E =~ m/ORA-06503/) {
- throw $E;
- }
- }
-
- return $can ? 1 : 0;
-}
-
sub set_channels {
my $self = shift;
my %params = validate(@_, {user_id => 1, channels => 1});
commit 9114215a7cb6bab81c61e14a20db0d570aa84a5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:23:36 2010 +0100
deactivate_satellite is not called, removing.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index f4174cc..2c66a04 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -727,61 +727,6 @@ EOQ
return $dbh;
}
-sub deactivate_satellite {
- my $self = shift;
- my $transaction = shift;
- my $dbh = $transaction || RHN::DB->connect();
- my $query;
- my $sth;
-
- $query = <<EOQ;
-DELETE FROM rhnSatelliteInfo
- WHERE server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- $query = <<EOQ;
-DELETE FROM rhnSatelliteChannelFamily
- WHERE server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- # actually unsubscribe from any satellite channels...
- $query = <<EOQ;
-DECLARE
-
- cursor subscribed_sat_channels(server_id_in in number) is
- SELECT DISTINCT SC.channel_id AS ID
- FROM rhnServerChannel SC, rhnChannelFamilyMembers CFM, rhnChannelFamily CF
- WHERE SC.server_id = server_id_in
- AND CF.label = 'rhn-satellite'
- AND CF.id = CFM.channel_family_id
- AND CFM.channel_id = SC.channel_id;
-
-BEGIN
-
- for subscribed_chan in subscribed_sat_channels(:server_id) loop
- rhn_channel.unsubscribe_server(:server_id, subscribed_chan.id);
- end loop;
-END;
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute_h(server_id => $self->id);
-
-
- $dbh->commit unless $transaction;
-
- delete $self->{__satellite_server_id__};
- delete $self->{__satellite_cert__};
-
- return $dbh;
-}
-
sub base_channel_id {
my $self = shift;
commit b92de672a33df0ce0bf08fffd02d0d19626a6618
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:20:42 2010 +0100
create_package does not seem to be used, removing.
diff --git a/web/modules/rhn/RHN/DB/Package.pm b/web/modules/rhn/RHN/DB/Package.pm
index 1fb338e..7e068ac 100644
--- a/web/modules/rhn/RHN/DB/Package.pm
+++ b/web/modules/rhn/RHN/DB/Package.pm
@@ -526,13 +526,6 @@ sub blank_package {
bless { }, shift;
}
-sub create_package {
- my $class = shift;
- my $package = $class->blank_package;
- $package->{__id__} = -1;
- return $package;
-}
-
sub arch_fields {
return @arch_fields;
}
commit b2e4afd799101a69be1169aaff36f4a80601baae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:19:08 2010 +0100
Removal of find_responsible_user made org_admins unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Org.pm b/web/modules/rhn/RHN/DB/Org.pm
index 5174fb3..a4039fb 100644
--- a/web/modules/rhn/RHN/DB/Org.pm
+++ b/web/modules/rhn/RHN/DB/Org.pm
@@ -463,31 +463,6 @@ EOQ
return 0;
}
-sub org_admins {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOS);
-SELECT ugm.user_id
- FROM rhnUserGroupMembers ugm,
- web_contact wc
- WHERE ugm.user_group_id = (SELECT id
- FROM rhnUserGroup
- WHERE org_id = ?
- AND group_type = (SELECT id FROM rhnUserGroupType WHERE label = 'org_admin'))
- AND wc.id = ugm.user_id
-ORDER BY wc.id
-EOS
- $sth->execute($self->id);
-
- my @ret;
- while (my ($id) = $sth->fetchrow) {
- push @ret, $id;
- }
-
- return @ret;
-}
-
sub entitled_satellite_families {
my $self = shift;
commit 58d16dd0a44af9e0659d3d4a3f6b289b2de79316
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:16:45 2010 +0100
Removal of mark_failed made current_server (and thus new_server and old_server) unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Kickstart/Session.pm b/web/modules/rhn/RHN/DB/Kickstart/Session.pm
index b4dee17..4bbd615 100644
--- a/web/modules/rhn/RHN/DB/Kickstart/Session.pm
+++ b/web/modules/rhn/RHN/DB/Kickstart/Session.pm
@@ -310,28 +310,6 @@ sub activation_keys {
return @tokens;
}
-sub old_server {
- my $self = shift;
-
- my $sid = $self->old_server_id;
-
- return $sid ? RHN::Server->lookup(-id => $sid) : undef;
-}
-
-sub new_server {
- my $self = shift;
-
- my $sid = $self->new_server_id;
-
- return $sid ? RHN::Server->lookup(-id => $sid) : undef;
-}
-
-sub current_server {
- my $self = shift;
-
- return ($self->new_server || $self->old_server);
-}
-
sub kstree {
my $self = shift;
commit e616f3949ce384f5fab33eb642eec347e33110cd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:05:50 2010 +0100
get_channel_arch is not used, removing; also removing default_tree which is called from get_channel_arch.
diff --git a/web/modules/rhn/RHN/DB/Kickstart.pm b/web/modules/rhn/RHN/DB/Kickstart.pm
index 59720b8..de97640 100644
--- a/web/modules/rhn/RHN/DB/Kickstart.pm
+++ b/web/modules/rhn/RHN/DB/Kickstart.pm
@@ -895,38 +895,6 @@ EOQ
return @{$data};
}
-sub default_tree {
- my $self = shift;
-
- my $kstree_id = $self->default_kstree_id;
-
- if ($kstree_id) {
- return RHN::KSTree->lookup(-id => $kstree_id);
- }
-
- return;
-}
-sub get_channel_arch {
- my $self = shift;
-
- my $channel_id = $self->default_tree->channel_id;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CA.label
- FROM rhnChannel C, rhnChannelArch CA
- WHERE 1=1
- AND C.id = :cid
- AND C.channel_arch_id = CA.id
-EOQ
-
- $sth->execute_h(cid => $channel_id);
-
- my $row = $sth->fetchrow_hashref;
- $sth->finish;
-
- return $row->{'LABEL'};
-}
sub org_ks_ip_ranges {
my $class = shift;
commit caadf000b654f502a332f0a3395715de0ec26238
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:12:54 2010 +0100
Removal of get_rhn_kickstart_package made latest_package_equal unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 1a895b8..309d399 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1135,24 +1135,6 @@ EOQ
return ($pid, $path);
}
-sub latest_package_equal {
- my $class = shift;
- my $cid = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CP.package_id
- FROM rhnPackageName PN, rhnChannelNewestPackage CP
- WHERE CP.channel_id = :cid
- AND CP.name_id = PN.id
- AND PN.name = :name
-EOQ
-
- $sth->execute_h(cid => $cid, name => $name);
- return map { @$_ } $sth->fullfetch;
-}
-
sub packaging_type {
my $class_or_self = shift;
commit 7812c69e7bd3c3f00d92af87a90d12a0476bbe32
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:12:00 2010 +0100
Removal of get_rhn_extras_channel made latest_package_like unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 49ca269..1a895b8 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1135,24 +1135,6 @@ EOQ
return ($pid, $path);
}
-sub latest_package_like {
- my $class = shift;
- my $cid = shift;
- my $name = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CP.package_id
- FROM rhnPackageName PN, rhnChannelNewestPackage CP
- WHERE CP.channel_id = :cid
- AND CP.name_id = PN.id
- AND PN.name LIKE :namelike
-EOQ
-
- $sth->execute_h(cid => $cid, namelike => '%' . $name . '%');
- return map { @$_ } $sth->fullfetch;
-}
-
sub latest_package_equal {
my $class = shift;
my $cid = shift;
commit 35bf6be8906087b09fe221400a592f770f57525e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 23:10:26 2010 +0100
available_entitlements and installable are not used, removing; also removing installable_path.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 4403efa..49ca269 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -370,25 +370,6 @@ EOQ
return @ret;
}
-sub available_entitlements {
- my $class = shift;
- my %params = validate(@_, {org_id => 1, channel_id => 1});
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- $query = "SELECT rhn_channel.available_chan_subscriptions(:channel_id, :org_id) FROM DUAL";
-
- $sth = $dbh->prepare($query);
- $sth->execute_h(org_id => $params{org_id}, channel_id => $params{channel_id});
-
- my ($count) = $sth->fetchrow;
- $sth->finish;
-
- return $count;
-}
-
sub has_downloads {
my $class = shift;
my $cid = shift;
@@ -1129,23 +1110,6 @@ EOQ
return;
}
-# XXX: hack; for now, rely on filesystem presence. later, store this
-# info in the database
-
-sub installable_path {
- my $self = shift;
-
- return "rhn/kickstart/" . $self->label;
-}
-
-sub installable {
- my $self = shift;
-
- my $path = File::Spec->catfile(PXT::Config->get('kickstart_mount_point'), $self->installable_path);
-
- return -d $path;
-}
-
sub package_by_filename_in_tree {
my $self = shift;
my $filename = shift;
commit 2c50ade1507bf5c06e4630da66e7ca3acd8714f0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:59:43 2010 +0100
get_user_id, set_user_id, get_server_id, and set_server_id do not seem to be used, removing.
diff --git a/web/modules/rhn/RHN/DB/AppInstall/Session.pm b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
index 25b300c..1940f3b 100644
--- a/web/modules/rhn/RHN/DB/AppInstall/Session.pm
+++ b/web/modules/rhn/RHN/DB/AppInstall/Session.pm
@@ -470,40 +470,4 @@ foreach my $field (keys %valid_fields) {
}
}
-sub get_user_id {
- my $self = shift;
-
- return $self->get_user->id()
-}
-
-sub set_user_id {
- my $self = shift;
- my $id = shift;
-
- my $user = RHN::User->lookup(-id => $id);
-
- $self->set_user($user);
- $self->{":modified:"}->{user_id} = 1;
-
- return;
-}
-
-sub get_server_id {
- my $self = shift;
-
- return $self->get_server->id()
-}
-
-sub set_server_id {
- my $self = shift;
- my $id = shift;
-
- my $server = RHN::Server->lookup(-id => $id);
-
- $self->set_server($server);
- $self->{":modified:"}->{server_id} = 1;
-
- return;
-}
-
1;
14 years, 3 months
5 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Scheduler.pm | 69 -----------------
web/modules/sniglets/Sniglets/ErrataEditor.pm | 29 -------
web/modules/sniglets/Sniglets/Forms.pm | 105 --------------------------
web/modules/sniglets/Sniglets/Packages.pm | 20 ----
4 files changed, 223 deletions(-)
New commits:
commit 0cb3c9445dfa65d19370f37345c6035d354b3b20
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:25:21 2010 +0100
Callbacks rhn:sscd_confirm_package_upgrades, rhn:sscd_confirm_package_installations, and rhn:sscd_confirm_package_removals not used, removing.
Note that the actual functions were not removed as they are still
used from elsewhere.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 36b8a79..2d63df8 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -52,11 +52,8 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:sscd_confirm_package_upgrades' => \&sscd_confirm_package_upgrades_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_installations' => \&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_installations' => \&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_patchset_installations' => \&sscd_confirm_package_installations_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_removals' => \&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_removals' => \&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:upload-answerfile-cb' => \&upload_answerfile_cb);
commit 8d4f5792619e5e0c200ba5f12611524faf00a78f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:23:47 2010 +0100
Removal of sscd_confirm_package_verification_cb made sscd_schedule_package_verify unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 6f890e3..07b31b0 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -408,75 +408,6 @@ EOQ
return \%actions;
}
-sub sscd_schedule_package_verify {
- my $class = shift;
- my %params = @_;
-
- my ($earliest, $org_id, $user_id) =
- map { $params{"-" . $_} } qw/earliest org_id user_id/;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOQ;
-SELECT DISTINCT S.id, S.name
- FROM rhnServer S,
- rhnServerPackage SP,
- rhnSet SYSTEM_SET
- WHERE SYSTEM_SET.user_id = ?
- AND SYSTEM_SET.label = 'system_list'
- AND SYSTEM_SET.element = SP.server_id
- AND SP.name_id IN (SELECT element FROM rhnSet WHERE user_id = SYSTEM_SET.user_id AND label = 'sscd_verify_package_list')
- AND SP.server_id = S.id
-ORDER BY UPPER(S.name)
-EOQ
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute($user_id);
-
- my @actions;
- while (my ($server_id, $server_name) = $sth->fetchrow) {
- my $action_name = "Package Verify for " . $server_name;
-
- my ($action_id, $action_stat_id) = $class->make_base_action(-org_id => $org_id,
- -user_id => $user_id,
- -type_label => 'packages.verify',
- -earliest => $earliest,
- -action_name => $action_name,
- );
-
- push @actions, { action_id => $action_id, status_id => $action_stat_id, server_id => $server_id };
- }
-
- foreach my $action (@actions) {
- $query = <<EOQ;
-INSERT INTO rhnServerAction (server_id, action_id, status) VALUES (?, ?, ?)
-EOQ
- $sth = $dbh->prepare($query);
- $sth->execute($action->{server_id}, $action->{action_id}, $action->{status_id});
-
- $query = <<EOQ;
-INSERT INTO rhnActionPackage (id, action_id, name_id, evr_id)
-(
-SELECT rhn_act_p_id_seq.nextval, ?, SP.name_id, SP.evr_id
- FROM rhnServerPackage SP, rhnSet PACKAGE_LIST
- WHERE PACKAGE_LIST.user_id = ?
- AND PACKAGE_LIST.label = 'sscd_verify_package_list'
- AND SP.server_id = ?
- AND SP.name_id = PACKAGE_LIST.element
- AND SP.evr_id = PACKAGE_LIST.element_two
-)
-EOQ
- $sth = $dbh->prepare($query);
- $sth->execute($action->{action_id}, $user_id, $action->{server_id});
- }
-
- $dbh->commit();
-
- osa_wakeup_tickle();
-
- return \@actions;
-}
-
# one or more package install or remove for a single system
sub sscd_schedule_package_removal {
commit f0ef8d979a7d0260cc0c4f9f5fadad1b20a915b5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:22:50 2010 +0100
rhn:sscd_confirm_package_verification not used, removing, as well as sscd_confirm_package_verification_cb.
diff --git a/web/modules/sniglets/Sniglets/Packages.pm b/web/modules/sniglets/Sniglets/Packages.pm
index 6304ac9..36b8a79 100644
--- a/web/modules/sniglets/Sniglets/Packages.pm
+++ b/web/modules/sniglets/Sniglets/Packages.pm
@@ -58,7 +58,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:sscd_confirm_patchset_installations' => \&sscd_confirm_package_installations_cb);
$pxt->register_callback('rhn:sscd_confirm_package_removals' => \&sscd_confirm_package_removals_cb);
$pxt->register_callback('rhn:sscd_confirm_patch_removals' => \&sscd_confirm_package_removals_cb);
- $pxt->register_callback('rhn:sscd_confirm_package_verification' => \&sscd_confirm_package_verification_cb);
$pxt->register_callback('rhn:upload-answerfile-cb' => \&upload_answerfile_cb);
}
@@ -478,22 +477,6 @@ sub sscd_confirm_package_removals_cb {
}
}
-sub sscd_confirm_package_verification_cb {
- my $pxt = shift;
-
- if ($pxt->dirty_param('sscd_confirm_package_verification')) {
- my $earliest = Sniglets::ServerActions->parse_date_pickbox($pxt);
-
- my $actions = RHN::Scheduler->sscd_schedule_package_verify(-org_id => $pxt->user->org_id, -user_id => $pxt->user->id, -earliest => $earliest);
- my $package_set = RHN::Set->lookup(-label => 'sscd_verify_package_list', -uid => $pxt->user->id);
- $package_set->empty;
- $package_set->commit;
-
- $pxt->push_message(site_info => "Package verifications scheduled.");
- $pxt->redirect("/network/systems/ssm/packages/index.pxt");
- }
-}
-
sub sscd_confirm_package_installations_cb {
my $pxt = shift;
my $mode = $pxt->dirty_param('mode') || '';
commit 08cddded2bf882f36614ee6eb88b98d84086e127
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:16:47 2010 +0100
Removal of edit_template_string.xml made rhn:catch_form and thus catch_form_cb and catch_form unused, removing.
diff --git a/web/modules/sniglets/Sniglets/Forms.pm b/web/modules/sniglets/Sniglets/Forms.pm
index 4a65cd7..447b23d 100644
--- a/web/modules/sniglets/Sniglets/Forms.pm
+++ b/web/modules/sniglets/Sniglets/Forms.pm
@@ -30,111 +30,6 @@ use PXT::Utils;
use PXT::ACL;
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-}
-
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:catch_form', \&catch_form_cb);
-}
-
-sub catch_form_cb {
- my $pxt = shift;
-
- my $obj = catch_form($pxt);
- my $url;
-
- if ($obj) {
- $obj->commit;
-
- my $redirect_url = $pxt->dirty_param('url');
- my $id_formvar = $pxt->dirty_param('id_formvar');
- if ($redirect_url) {
- $url = $redirect_url;
- }
- else {
- $url = $pxt->uri;
- }
-
- $url = $url . '?' . $id_formvar . '=' . $obj->id;
- }
-
- $pxt->push_message(site_info => "Item updated.");
- $pxt->redirect($url) if $url;
-
- return;
-}
-
-sub catch_form {
- my $pxt = shift;
-
- my $file = $pxt->dirty_param('form_file');
-
- throw "Could not load form '$file'."
- unless ($file);
-
- my $pform = RHN::Form::Parser->parse_file($file);
-
- throw "'$pform' is not a RHN::Form::ParsedForm"
- unless (ref $pform && $pform->isa('RHN::Form::ParsedForm'));
-
- my $file_widget = new RHN::Form::Widget::Hidden(name => 'Form File',
- label => 'form_file',
- default => $file);
-
- $pform->add_widget($file_widget);
-
- my $acl_parser = new PXT::ACL (mixins => [ $pform->acl_mixins ]);
-# remove widgets based upon ACLs
- foreach my $widget ($pform->widgets) {
- next unless $widget->acl;
-
- if (not $acl_parser->eval_acl($pxt, $widget->acl)) {
- $pform->remove_widget($widget->label);
- }
- }
-
- my $form = $pform->prepare_response;
- my $errors = load_params($pxt, $form);
- my $source = $pxt->dirty_param('source');
-
- if (@{$errors}) {
- foreach my $error (@{$errors}) {
- $pxt->push_message(local_alert => $error);
- }
- return;
- }
-
- if ($source) {
- my $id_formvar = $pxt->dirty_param('id_formvar');
-
- PXT::Utils->untaint(\$source);
-
- eval "use $source";
- die $@ if $@;
-
- my $obj = $source->lookup(-id => $pxt->passthrough_param($id_formvar));
-
- foreach my $widget ($form->widgets) {
- my $label = $widget->label;
-
- next if $widget->isa('RHN::Form::Widget::Literal');
- next unless $obj->can($label);
-
- my $val = $widget->raw_value;
- $obj->$label($val);
- }
-
- return $obj;
- }
-
- return;
-}
-
sub load_params {
my $pxt = shift;
my $form = shift;
commit df3adb5fc41894d8ce1afc63a1bfac0a56c65053
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 5 22:12:38 2010 +0100
Removal of errata_cache_update.pxi made rhn:update_errata_cache and update_errata_cache not used, removing.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index bf12bc3..75ab75f 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -32,35 +32,6 @@ sub register_tags {
$pxt->register_tag('rhn-unless-var' => \&unless_var, -5);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
-}
-
-sub update_errata_cache {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- die "ErrataEditor::update_errata_cache called without eid"
- unless $eid;
-
- foreach my $cid (RHN::Errata->channels($eid)) {
- unless ($pxt->user->verify_channel_admin($cid)) {
- $pxt->redirect("/errors/permission.pxt");
- }
-
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid);
- }
-
- my $package_list_edited = $pxt->session->get('errata_package_list_edited');
- $package_list_edited->{$eid} = 0;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
-
- $pxt->redirect($pxt->uri . "?eid=$eid");
-}
-
sub if_var {
my $pxt = shift;
my %attr = @_;
14 years, 3 months