10 commits - web/modules web/spacewalk-web.spec
by Jan Pazdziora
web/modules/rhn/RHN/DB/Server.pm | 125 ----------------
web/modules/rhn/RHN/DB/ServerPackage.pm | 130 ----------------
web/modules/rhn/RHN/Kickstart/Template.pm | 92 ------------
web/modules/rhn/RHN/Message.pm | 53 ------
web/modules/rhn/RHN/ServerPackage.pm | 45 -----
web/modules/sniglets/Sniglets/ListView/Dobby.pm | 58 -------
web/modules/sniglets/Sniglets/Proxy.pm | 117 ---------------
web/modules/sniglets/Sniglets/Satellite.pm | 184 ------------------------
web/modules/sniglets/Sniglets/Servers.pm | 64 --------
web/modules/sniglets/Sniglets/Users.pm | 45 -----
web/spacewalk-web.spec | 2
11 files changed, 915 deletions(-)
New commits:
commit dc0b7001f9fad5efd2ce69848c9be94af6a7ce8e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:57:39 2009 +0100
No xmlrpc in Sniglets::Users anymore, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index ae41897..6401b0a 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -99,14 +99,6 @@ sub tnc_accepted_cb {
$pxt->redirect("/rhn/YourRhn.do");
}
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('rhn_login', \&rhn_login_xmlrpc);
- $pxt->register_xmlrpc('rhn_logout', \&rhn_logout_xmlrpc);
-}
-
# secures *all* intraserver links and all links to specified exterior servers
sub secure_links_if_logged_in {
my $pxt = shift;
@@ -525,43 +517,6 @@ sub rhn_logout_cb {
}
-sub rhn_login_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- # sadly, this was necessary. we've broken the "old" (closed) protocols
-
- if (ref $params ne 'HASH') {
- $pxt->rpc_fault('old_client');
- }
-
- my ($username, $password) = ($params->{username}, $params->{password});
-
- if ($pxt->session->uid) {
- warn "User already logged in";
- return $pxt->user->id;
- }
-
- my $user = RHN::User->check_login($username, $password);
-
- if ($user and !($user->is_disabled())) {
- $pxt->session->uid($user->id);
- $pxt->touch_session;
- $pxt->session->serialize;
- }
- else {
- $pxt->rpc_fault("invalid_login");
- }
-
- return $user ? $pxt->session->key : undef;
-}
-
-sub rhn_logout_xmlrpc {
- my $pxt = shift;
- my $session = shift;
-
- $pxt->clear_session;
-}
-
sub admin_user_edit_cb {
my $pxt = shift;
commit 8796503a351716afc73fb2cbc32444735e27b2ca
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:55:39 2009 +0100
Removal of server_outdated_package_list_xmlrpc made outdated_package_overview not needed, removing.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 3c03a0e..ac0d273 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -1902,131 +1902,6 @@ EOS
}
-sub outdated_package_overview {
- my $self = shift;
- my %params = @_;
-
- my ($lower, $upper, $total_ref, $all) = map { $params{"-" . $_} } qw/lower upper total_rows all/;
-
- $lower ||= 1;
- $upper ||= 100000;
-
- $$total_ref = 0;
-
- my $dbh = RHN::DB->connect;
-
- my $query = <<EOQ;
-SELECT
- pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) ID_COMBO,
- full_list.server_id,
- pn.id,
- lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release),
- pn.name ||'-'|| full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch),
- full_list.errata_id,
- full_list.errata_advisory,
- full_list.evr.epoch,
- full_list.evr.version,
- full_list.evr.release,
- E.advisory_type
-FROM rhnErrata E,
- (
- SELECT SOP.package_name_id name_id, MAX(pe.evr) evr, SOP.server_id server_id, SOP.errata_id errata_id, SOP.errata_advisory errata_advisory
- FROM
- rhnPackageEVR PE,
- rhnServerOutdatedPackages SOP
- WHERE SOP.server_id = ?
- AND SOP.package_evr_id = PE.id
- GROUP BY SOP.package_name_id, SOP.server_id, SOP.errata_id, SOP.errata_advisory
- ) full_list,
- rhnPackageName PN
-WHERE
- full_list.name_id = PN.id
- AND full_list.errata_id = E.id (+)
-ORDER BY UPPER(PN.name)
-EOQ
-
- my $sth = $dbh->prepare($query);
-
- $sth->execute($self->id);
-
- my %latest;
-
- while (my @row = $sth->fetchrow) {
-
- my @eids;
- my @eadvs;
- my @etypes;
-
- push @eids, $row[5] if $row[5];
- push @eadvs, $row[6] if $row[6];
- push @etypes, $row[10] if $row[10];
-
- if (not exists $latest{$row[2]}) {
- $latest{$row[2]} = \@row;
- }
- else {
- my $cmp = RHN::Package->vercmp($row[7],
- $row[8],
- $row[9],
- $latest{$row[2]}->[7],
- $latest{$row[2]}->[8],
- $latest{$row[2]}->[9]);
-
- push @eids, @{$latest{$row[2]}->[5]};
- push @eadvs, @{$latest{$row[2]}->[6]};
-
- $latest{$row[2]} = \@row
- if $cmp >= 0;
- }
- $latest{$row[2]}->[5] = \@eids;
- $latest{$row[2]}->[6] = \@eadvs;
- $latest{$row[2]}->[7] = \@etypes;
- }
-
- my @ret;
- my $i = 1;
-
- foreach my $nid (sort { $latest{$a}->[4] cmp $latest{$b}->[4] } keys %latest) {
- $$total_ref = $i;
- if ($all or ($i >= $lower and $i <= $upper)) {
- push @ret, [ @{$latest{$nid}}[0 .. 7] ];
- }
- $i++;
- }
-
- $sth = $dbh->prepare(<<EOS);
-SELECT SPN.name || '-' || SPE.evr.as_vre_simple()
- FROM rhnPackageName SPN,
- rhnPackageEVR SPE,
- rhnPackageEVR PE,
- rhnServerPackage SP
- WHERE SP.server_id = ?
- AND SP.name_id = ?
- AND PE.id = ?
- AND SPE.id = SP.evr_id
- AND SPN.id = SP.name_id
- AND SP.evr_id != PE.id
- AND SPE.evr < PE.evr
-ORDER BY UPPER(SPN.name), SPE.evr DESC
-EOS
-
- foreach my $row (@ret) {
- my $nid = $row->[2];
- my $eid = $row->[3];
-
- $sth->execute($self->id, $nid, $eid);
-
- my @evr;
- while (my ($installed_package_vre) = $sth->fetchrow) {
- push @evr, $installed_package_vre;
- }
-
- $row->[8] = join(", ", @evr);
- }
-
- return @ret;
-}
-
sub package_groups {
my $self = shift;
commit 1979a2b6fbefe04c7416c66bfdbf3bc6622470b8
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:54:05 2009 +0100
No xmlrpc in Sniglets::Servers anymore, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 5d74233..787e411 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -120,15 +120,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:osa-ping' => \&osa_ping_cb);
}
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('server_needed_packages', \&server_outdated_package_list_xmlrpc);
- $pxt->register_xmlrpc('server_schedule_errata_update', \&server_schedule_errata_update_xmlrpc);
- $pxt->register_xmlrpc('server_schedule_package_update', \&server_schedule_package_update_xmlrpc);
-}
-
sub osa_ping_cb {
my $pxt = shift;
my $sid = $pxt->param('sid');
@@ -985,61 +976,6 @@ sub handle_system_entitlement_change {
return;
}
-sub server_outdated_package_list_xmlrpc {
- my $pxt = shift;
- my $params = shift;
-
- my ($token, $sid) = @{$params}{qw/token server_id/};
- $pxt->user->verify_system_access($sid) or die "No permissions to server";
-
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $unused;
- my @rows = $server->outdated_package_overview(-lower => 0, -upper => 10000, -total_rows => \$unused);
-
- my @ret = map { { (nvre => $_->[4], advisory => $_->[6] || '', errata_id => $_->[5], name_id => $_->[2], evr_id => $_->[3]) } } @rows;
-
- return \@ret;
-}
-
-sub server_schedule_package_update_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- my ($token, $sid, $name_id, $evr_id) = @{$params}{qw/token server_id name_id evr_id/};
-
- $pxt->user->verify_system_access($sid) or die "No permissions to server";
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $package_id = RHN::Package->guestimate_package_id(-server_id => $sid, -name_id => $name_id, -evr_id => $evr_id);
-
- my $earliest_date = RHN::Date->now->long_date;
- my $action_id = RHN::Scheduler->schedule_package_install(-org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -package_id => $package_id,
- -server_id => $server->id);
-
- return $action_id;
-}
-
-sub server_schedule_errata_update_xmlrpc {
- my $pxt = shift;
- my $params = shift;
- my ($token, $sid, $eid) = @{$params}{qw/token server_id errata_id/};
-
- $pxt->user->verify_system_access($sid) or die "No permissions to server";
- my $server = RHN::Server->lookup(-id => $sid);
-
- my $earliest_date = RHN::Date->now->long_date;
- my ($action_id) = RHN::Scheduler->schedule_errata_updates_for_system(-org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -errata_ids => [ $eid ],
- -server_id => $server->id);
-
- return $action_id;
-}
-
sub server_network_details {
my $pxt = shift;
my %params = @_;
commit e2726bd7babb34719f24f12ce61f47703ec24672
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:47:00 2009 +0100
Package Sniglets::Satellite is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Satellite.pm b/web/modules/sniglets/Sniglets/Satellite.pm
deleted file mode 100644
index 9fe72f8..0000000
--- a/web/modules/sniglets/Sniglets/Satellite.pm
+++ /dev/null
@@ -1,184 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::Satellite;
-
-use RHN::Exception;
-use MIME::Lite;
-use MIME::Base64;
-use RHN::Mail;
-use PXT::Config;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('satellite.send_debug_data', \&send_debug_data);
- $pxt->register_xmlrpc('satellite.server_set_base_channel', \&server_set_base_channel);
- $pxt->register_xmlrpc('satellite.server_clear_groups', \&server_clear_groups);
- $pxt->register_xmlrpc('satellite.server_clear_channels', \&server_clear_channels);
- $pxt->register_xmlrpc('satellite.server_join_groups', \&server_join_groups);
- $pxt->register_xmlrpc('satellite.server_subscribe_channels', \&server_subscribe_channels);
-}
-
-
-
-sub server_join_groups {
- my $pxt = shift;
- my $system_id = shift;
- my @server_groups = @{+shift};
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my %server_groups = map { $_ => 1 } @server_groups;
- my @group_ids = map { $_->[1] } grep { $_->[0] == 0 and exists $server_groups{$_->[2]} } $server->visible_group_list_for_server();
-
- RHN::Server->add_servers_to_groups([$server->id], \@group_ids);
-
- return [];
-}
-
-sub server_clear_groups {
- my $pxt = shift;
- my $system_id = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my @group_ids = map { $_->[1] } grep { $_->[0] == 1 } $server->visible_group_list_for_server();
-
- RHN::Server->remove_servers_from_groups([$server->id], \@group_ids);
-
- return [];
-}
-
-sub server_set_base_channel {
- my $pxt = shift;
- my $system_id = shift;
- my $channel_label = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my $channel_id = RHN::Channel->channel_id_by_label($channel_label);
-
- return [ 'Error', "No such base channel '$channel_label'" ]
- unless defined $channel_id;
-
- $server->change_base_channel($channel_id);
-
- return [];
-}
-
-sub server_subscribe_channels {
- my $pxt = shift;
- my $system_id = shift;
- my @channel_labels = @{+shift};
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- my @channel_ids = map { RHN::Channel->channel_id_by_label($_) } @channel_labels;
-
- my @errors;
- for my $i (0 .. $#channel_labels) {
- push @errors, [ 'Error', "No such channel '$channel_labels[$i]'" ]
- unless defined $channel_ids[$i];
- }
-
- $server->subscribe_to_channel($_) for grep { defined $_ } @channel_ids;
-
- return @errors;
-}
-
-sub server_clear_channels {
- my $pxt = shift;
- my $system_id = shift;
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- my $E = $@;
- if ($E) {
- warn "lookup_cert: $E";
-
- $pxt->rpc_fault('invalid_certificate');
- }
-
- $server->unsubscribe_from_channel($_) for $server->server_channel_ids;
-
- return [];
-}
-
-sub send_debug_data {
- my $pxt = shift;
- my $debug_file = MIME::Base64::decode_base64(shift);
-
- my $to = PXT::Config->get('traceback_mail');
- my $mime = MIME::Lite->new(From => PXT::Config->get('product_name') . " <rhn-admin\(a)rhn.redhat.com>",
- To => $to,
- Subject => PXT::Config->get('product_name') . " Debug Dump",
- Type => "application/octet-stream",
- Data => $debug_file,
- Encoding => "base64",
- Filename => "satellite-debug.tar.bz2");
-
- RHN::Mail->send_raw($mime->as_string);
-
- return 1;
-}
-
-1;
commit 1e8cca108b6562879d7c0a13153150fa82834fa5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:44:25 2009 +0100
Package Sniglets::Proxy is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Proxy.pm b/web/modules/sniglets/Sniglets/Proxy.pm
deleted file mode 100644
index f486e98..0000000
--- a/web/modules/sniglets/Sniglets/Proxy.pm
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-### THIS SHOULD ALL BE DEPRECATED SOMEDAY, EXCEPT THERE MIGHT BE OLD PROXIES OUT THERE :(
-
-use strict;
-
-package Sniglets::Proxy;
-
-use RHN::Exception;
-use MIME::Lite;
-use MIME::Base64;
-use RHN::Mail;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc('proxy.activate_proxy', \&activate_proxy_xmlrpc);
- $pxt->register_xmlrpc('proxy.send_debug_data', \&send_debug_data);
-}
-
-sub activate_proxy_xmlrpc {
- my $pxt = shift;
- my $system_id = shift;
- my $version = shift;
-
- my $transaction = RHN::DB->connect();
- $transaction->nest_transactions();
-
-
- my $server;
- eval {
- $server = RHN::Server->lookup_by_cert($system_id);
- };
-
- if ($@) {
- $pxt->rpc_fault('proxy_invalid_systemid');
- }
-
- eval {
- unless ($server->has_entitlement('enterprise_entitled')) {
- $transaction = $server->entitle_server('enterprise_entitled');
- }
- $transaction->commit;
- };
-
- my $E = $@;
- if ($E) {
- $transaction->nested_rollback();
-
- if (ref $E and catchable($E) and $E->is_rhn_exception('servergroup_max_members')) {
- $pxt->rpc_fault("proxy_no_enterprise_entitlements");
- }
-
- # couldn't handle it; ISE and report
- throw $E;
- }
-
- eval {
- $server->activate_proxy(version => $version);
- };
-
- $E = $@;
- if ($E) {
- $transaction->nested_rollback();
-
- if (ref $E and catchable($E)) {
- if ($E->is_rhn_exception('channel_family_no_subscriptions')) {
- $pxt->rpc_fault('proxy_no_channel_entitlements');
- }
- elsif ($E->is_rhn_exception('proxy_no_proxy_child_channel')) {
- $pxt->rpc_fault('proxy_no_proxy_child_channel');
- }
- }
-
- # couldn't handle it; ISE and report
- throw $E;
- }
-
- $transaction->nested_commit();
-
- return 1;
-}
-
-sub send_debug_data {
- my $pxt = shift;
- my $debug_file = MIME::Base64::decode_base64(shift);
-
- my $to = PXT::Config->get('traceback_mail');
-
- my $mime = MIME::Lite->new(From => PXT::Config->get('product_name') . " <rhn-admin\(a)rhn.redhat.com>",
- To => $to,
- Subject => "RHN Proxy Debug Dump",
- Type => "application/octet-stream",
- Data => $debug_file,
- Encoding => "base64",
- Filename => "proxy-debug.tar.bz2");
-
- RHN::Mail->send_raw($mime->as_string);
-
- return 1;
-}
-
-1;
commit f6e4f448384c5a8c5db3dd1696949b5431fbf983
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:41:30 2009 +0100
Package Sniglets::ListView::Dobby is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/ListView/Dobby.pm b/web/modules/sniglets/Sniglets/ListView/Dobby.pm
deleted file mode 100644
index f1c5080..0000000
--- a/web/modules/sniglets/Sniglets/ListView/Dobby.pm
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::ListView::Dobby;
-
-use Sniglets::ListView::List;
-use RHN::Exception qw/throw/;
-use RHN::Token;
-use RHN::DataSource::Dobby;
-
-use Data::Dumper;
-
-our @ISA = qw/Sniglets::ListView::List/;
-
-my %mode_data;
-sub mode_data { return \%mode_data }
-
-_register_modes();
-
-sub trap {
- return "rhn:dev_dobby_cb";
-}
-
-sub _register_modes {
- Sniglets::ListView::List->add_mode(-mode => "tablespace_overview",
- -datasource => RHN::DataSource::Dobby->new,
- -provider => \&tablespace_overview_provider);
-}
-
-sub tablespace_overview_provider {
- my $self = shift;
- my $pxt = shift;
-
- my %ret = $self->default_provider($pxt);
-
- my $data = $ret{data};
- foreach my $row (@{$data}) {
- $row->{PERCENT_USED} = sprintf("%.02f%%", $row->{PERCENT_USED} * 100);
- }
-
- return %ret;
-}
-
-1;
commit d4ca9239438baa973bdbabd2c06cbbec6dd7c762
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:37:45 2009 +0100
Removal of RHN::ServerPackage makes RHN::DB::ServerPackage unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/ServerPackage.pm b/web/modules/rhn/RHN/DB/ServerPackage.pm
deleted file mode 100644
index 73ed4a9..0000000
--- a/web/modules/rhn/RHN/DB/ServerPackage.pm
+++ /dev/null
@@ -1,130 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-# represents packages on servers. we only know nvre about these things, apparently...
-
-use strict;
-
-package RHN::DB::ServerPackage;
-
-use RHN::DB;
-use Carp;
-
-# given a server id, spit back the entire list of packages on a server...
-sub package_list_by_server {
- my $class = shift;
-
-}
-
-# given a server id and package group, spit back the list of packages on a server in a package group...
-sub package_list_by_group_by_server {
- my $class = shift;
- my %params = @_;
-
- my ($sid, $gupper, $glower) =
- map { $params{"-" . $_} } qw/sid gupper glower/;
-
- my $server = RHN::Server->lookup(-id => $sid);
- my $groups = $server->package_groups;
-
- my @pkgs;
-
- foreach my $upper (sort { lc $a cmp lc $b } keys %{$groups}) {
- next unless $gupper eq $upper;
-
- if ($glower) {
- push @pkgs, sort { lc $a cmp lc $b } @{$groups->{$gupper}->{$glower}};
- }
- else {
- push @pkgs, sort { lc $a cmp lc $b } map { @{$groups->{$gupper}->{$_}} } keys %{$groups->{$gupper}};
- }
- }
-
- return @pkgs;
-}
-
-# arguments:
-# -org_id => $pxt->user->org_id, -lower => $lower,
-# -upper => $upper, -total_rows => \$total_rows,
-# -sid => $sid
-sub package_list_by_server_overview {
- my $class = shift;
- my %params = @_;
-
- my ($org_id, $lower, $upper, $total_ref, $sid, $gupper, $glower, $like) =
- map { $params{"-" . $_} } qw/org_id lower upper total_rows sid gupper glower like/;
-
- $lower ||= 1;
- $upper ||= 100000;
-
- my $dbh = RHN::DB->connect;
-
- my @result;
-
- my $i = 1;
- $$total_ref = 0;
-
- if (!$gupper) {
-
-
- my $and_clause = '';
- if ($like) {
- $and_clause = 'AND SP_NAME.name LIKE ?';
- }
-
- my $query = <<EOQ;
- SELECT SP_NAME.name, SP_EVR.evr.as_vre_simple() NVRE, SP.name_id || '|' || SP.evr_id
- FROM rhnPackageEvr SP_EVR, rhnPackageName SP_NAME, rhnServerPackage SP
- WHERE SP.server_id = ?
- AND SP.name_id = SP_NAME.id
- AND SP.evr_id = SP_EVR.id
- $and_clause
-ORDER BY UPPER(SP_NAME.name), SP_EVR.evr DESC
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute($sid, $like ? "%$like%" : ());
-
-
- while (my @data = $sth->fetchrow) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
- push @result, [ @data ];
- }
- $i++;
- }
- $sth->finish;
- } else {
-
- # hrm. theoretically, this could be a large number of packages,
- # which means a decent sized data structure. Could optimize here probably.
- my @temp_results = RHN::DB::ServerPackage->package_list_by_group_by_server(-sid => $sid, -gupper => $gupper, -glower => $glower);
- my @temp_results2 = sort { (lc $a->[1]) cmp (lc $b->[1]) } @temp_results;
-
- #warn "(hopefully xsorted) Packages in group $gupper".($glower ? " ($glower)" : "").": ".Data::Dumper->Dump([(@temp_results2)]);
- foreach my $data (@temp_results2) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
-# warn "total == $$total_ref, lower == $lower, upper == $upper, i == $i";
- push @result, $data;
- }
- $i++;
- }
- }
-
- return @result;
-}
-
-1;
commit 13ce9e28af42934fd49fb185f476b7d5b247e13a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:36:24 2009 +0100
Package RHN::ServerPackage is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/ServerPackage.pm b/web/modules/rhn/RHN/ServerPackage.pm
deleted file mode 100644
index f526520..0000000
--- a/web/modules/rhn/RHN/ServerPackage.pm
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-
-# represents packages on servers. we only know nvre about these things, apparently...
-
-use strict;
-
-package RHN::ServerPackage;
-
-use RHN::DB::ServerPackage;
-
-# given a server id, spit back the entire list of packages on a server...
-sub package_list_by_server {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_server(@_);
-}
-
-# given a server id and package group, spit back the list of packages on a server in a package group...
-sub package_list_by_group_by_server {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_group_by_server(@_);
-}
-
-sub package_list_by_server_overview {
- my $class = shift;
-
- return RHN::DB::ServerPackage->package_list_by_server_overview(@_);
-}
-
-1;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 268a754..90a7280 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -222,7 +222,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/ServerGroup.pm
%{perl_vendorlib}/RHN/ServerMessage.pm
%{perl_vendorlib}/RHN/ServerNotes.pm
-%{perl_vendorlib}/RHN/ServerPackage.pm
%{perl_vendorlib}/RHN/Session.pm
%{perl_vendorlib}/RHN/Set.pm
%{perl_vendorlib}/RHN/SimpleStruct.pm
commit ea6ea88735ada62aeb2f5075276c20eb8a048126
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:35:07 2009 +0100
Package RHN::Message is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/Message.pm b/web/modules/rhn/RHN/Message.pm
deleted file mode 100644
index 59ba72d..0000000
--- a/web/modules/rhn/RHN/Message.pm
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-package RHN::Message;
-
-use strict;
-use RHN::ServerMessage;
-use RHN::TextMessage;
-use RHN::Utils;
-use RHN::DB::Message;
-
-our @ISA = qw/RHN::DB::Message/;
-
-sub get_user_messages {
- my $class = shift;
- my @attr = @_;
-
- my $messages = RHN::DB::Message->user_messages(@attr);
- my @messages = ( );
-
- if (ref $messages and @{$messages} > 0) {
- @messages = RHN::Utils->parameterize($messages, qw/id type priority status server_id server_event body created modified/)
- }
-
- return [ @messages ];
-}
-
-sub lookup {
- my $class = shift;
- my $message_id = shift;
-
- my $msg = RHN::DB::Message::TextMessage->lookup_message($message_id);
-
- return $msg if defined $msg;
-
- $msg = RHN::DB::Message::ServerMessage->lookup_message($message_id);
-
- return $msg;
-}
-
-1;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7af3df9..268a754 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -199,7 +199,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/Kickstart/
%{perl_vendorlib}/RHN/Mail.pm
%{perl_vendorlib}/RHN/Manifest.pm
-%{perl_vendorlib}/RHN/Message.pm
%{perl_vendorlib}/RHN/MonitoringConfigMacro.pm
%{perl_vendorlib}/RHN/Org.pm
%{perl_vendorlib}/RHN/Package.pm
commit 1249b776313600bef304b21ce27f131b627fcf52
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:34:05 2009 +0100
Package RHN::Kickstart::Template is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/Kickstart/Template.pm b/web/modules/rhn/RHN/Kickstart/Template.pm
deleted file mode 100644
index a624f35..0000000
--- a/web/modules/rhn/RHN/Kickstart/Template.pm
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-package RHN::Kickstart::Template;
-
-use PXT::Config;
-use RHN::Kickstart;
-use RHN::Kickstart::Commands;
-use RHN::Kickstart::Partitions;
-use RHN::KSTree;
-
-use Data::Dumper;
-
-sub get_template_ks {
- my $class = shift;
- my $org_id = shift;
- my $install_type = shift || 'rhel_2.1';
-
- die "No org id" unless $org_id;
-
- my %commands = (-install => '',
- -text => '',
- -network => [ qw/--bootproto dhcp/ ],
- -url => [ qw(--url http://rhn.webdev.redhat.com/kickstart/dist/<dist>/) ],
- -auth => [ qw(--enablemd5 --enableshadow) ],
- -bootloader => [ qw(--location mbr) ],
- -lang => 'en_US',
- -langsupport => [ qw(--default en_US en_US) ],
- -keyboard => 'us',
- -mouse => 'none',
- -zerombr => 'yes',
- -clearpart => [ qw/--all/ ],
- -firewall => [ qw/--disabled/ ],
- -rootpw => '',
- -timezone => [ 'America/New_York' ],
- -skipx => '',
- -reboot => '',
- );
-
- if ($install_type eq 'rhel_4') {
- $commands{-partitions} = new RHN::Kickstart::Partitions( [ qw(/boot --fstype=ext3 --size=200) ],
- [ qw(swap --size=2000) ],
- [ qw(pv.01 --size=1000 --grow) ],
- );
- $commands{-volgroups} = new RHN::Kickstart::Volgroups( [ qw(myvg pv.01) ] );
- $commands{-logvols} = new RHN::Kickstart::Logvols( [ qw(/ --vgname=myvg --name=rootvol --size=1000 --grow) ] );
- }
- else {
- $commands{-partitions} = new RHN::Kickstart::Partitions( [ qw(/boot --fstype=ext3 --size=200) ],
- [qw(swap --size=1000 --grow --maxsize=2000) ],
- [ qw(/ --fstype=ext3 --size=700 --grow) ]
- );
- }
-
- my @packages = ('@ Base');
-
- my $ks = new RHN::Kickstart(-name => 'New Kickstart profile',
- -label => 'new_kickstart_profile',
- -commands => \%commands,
- -org_id => $org_id);
-
- $ks->packages(@packages);
-
- my $post = q!
-# MOTD
-echo >> /etc/motd
-echo "RHN kickstart on $(date +'%Y-%m-%d')" >> /etc/motd
-echo >> /etc/motd
-!;
-
- $ks->post($post);
-
- my $host = PXT::Config->get('kickstart_host') || PXT::Config->get('base_domain');
- $ks->change_url_host($host);
-
- return $ks;
-}
-
-1;
14 years, 5 months
7 commits - web/modules web/spacewalk-web.spec
by Jan Pazdziora
web/modules/dobby/Dobby/Env.pm | 19
web/modules/grail/Grail/Application.pm | 20
web/modules/pxt/PXT/Lint.pm | 48 --
web/modules/rhn/RHN/AppInstall/Process/Step/Requirements/Requirement.pm | 108 -----
web/modules/rhn/RHN/DB/Inspector.pm | 124 -----
web/modules/rhn/RHN/DataSource/ContactGroup.pm | 24 -
web/modules/rhn/RHN/ErrataMailer.pm | 208 ----------
web/spacewalk-web.spec | 1
8 files changed, 552 deletions(-)
New commits:
commit 751457e17194686d30996c174c03f775ada24cb0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:28:50 2009 +0100
Package RHN::ErrataMailer is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/ErrataMailer.pm b/web/modules/rhn/RHN/ErrataMailer.pm
deleted file mode 100644
index 4e24ac4..0000000
--- a/web/modules/rhn/RHN/ErrataMailer.pm
+++ /dev/null
@@ -1,208 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-package RHN::ErrataMailer;
-use strict;
-
-use Params::Validate;
-
-use RHN::DB;
-use RHN::Errata;
-use RHN::Postal;
-
-sub new {
- my $class = shift;
- my %params = validate(@_, { -errata_id => 1, -org_id => 1 });
-
- my $self = bless { users => {}, servers => {} }, $class;
- $self->{errata_id} = $params{-errata_id};
- $self->{org_id} = $params{-org_id};
-
- return $self;
-}
-
-sub prepare_work_queue {
- my $self = shift;
- my %params = validate(@_, { -dbh => 1 });
- my $dbh = $params{-dbh};
- my $errata_id = $self->{errata_id};
-
- my @query_params = (errata_id => $errata_id, org_id => $self->{org_id});
- my $query = <<" EOS";
- INSERT INTO rhnPaidErrataTempCache
- (user_id, server_id, errata_id)
- SELECT DISTINCT user_id, server_id, :errata_id
- FROM rhnPrivateErrataMail
- WHERE errata_id = :errata_id
- AND org_id = :org_id
- EOS
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(@query_params);
-}
-
-sub prepare_users {
- my $self = shift;
- my %params = validate(@_, { -dbh => 1 });
- my $dbh = $params{-dbh};
-
- my $user_sth = $dbh->prepare(<<" EOS");
- SELECT WC.id, WC.org_id, WC.login, WUPI.email
- FROM web_user_personal_info WUPI,
- web_contact WC,
- rhnPaidErrataTempCache PETC
- WHERE WC.id = PETC.user_id
- AND WUPI.web_user_id = WC.id
- EOS
- $user_sth->execute;
- while (my $user = $user_sth->fetchrow_hashref_copy) {
- $self->{users}->{$user->{ID}} = $user;
- }
-}
-
-sub prepare_systems {
- my $self = shift;
- my %params = validate(@_, { -dbh => 1 });
- my $dbh = $params{-dbh};
-
- my $system_sth = $dbh->prepare(<<" EOS");
- SELECT S.id, S.name, C.name base_channel
- FROM rhnChannel C,
- rhnServerChannel SC,
- rhnServer S,
- rhnServerArch SA,
- rhnPaidErrataTempCache PETC
- WHERE S.server_arch_id = SA.id
- AND S.id = PETC.server_id
- AND S.id = SC.server_id
- AND SC.channel_id = C.id
- AND C.parent_channel IS NULL
- EOS
- $system_sth->execute;
- while (my $system = $system_sth->fetchrow_hashref_copy) {
- $self->{servers}->{$system->{ID}} = $system;
- }
-}
-
-sub prepare_batch {
- my $self = shift;
- my %params = validate(@_, { -dbh => 1 });
- my $dbh = $params{-dbh};
-
- my $batch_sth = $dbh->prepare(<<" EOS");
- SELECT user_id, server_id
- FROM rhnPaidErrataTempCache PETC
- EOS
- $batch_sth->execute;
- while (my ($user_id, $server_id) = $batch_sth->fetchrow) {
- push @{$self->{batch}->{$user_id}}, $server_id;
- }
-}
-
-sub prepare_errata {
- my $self = shift;
-
- my $e = RHN::Errata->lookup(-id => $self->{errata_id});
- my $errata_subst =
- {
- 'errata-id' => $e->id,
- 'errata-advisory' => $e->advisory,
- 'errata-advisory-type' => $e->advisory_type,
- 'errata-topic' => $e->topic,
- 'errata-synopsis' => $e->synopsis,
- 'errata-description' => $e->description,
- 'errata-notes' => $e->notes,
- 'errata-references' => $e->refers_to,
- };
-
- $self->{errata} = $e;
- $self->{errata_substitutions} = $errata_subst;
-}
-
-sub prepare_postal {
- my $self = shift;
-
- my $letter = new RHN::Postal;
- my $filename = "errata_mail/paid_errata_notice.xml";
- $letter->template($filename);
-
- $self->{letter} = $letter;
- $letter->set_tag($_, $self->{errata_substitutions}->{$_}) for keys %{$self->{errata_substitutions}};
-}
-
-sub send_user_email {
- my $self = shift;
- my %params = validate(@_, { -user_id => 1 });
- my $user_id = $params{-user_id};
-
- my $letter = $self->{letter};
- $letter->set_tag("login" => $self->{users}->{$user_id}->{LOGIN});
- $letter->set_tag("email-address" => $self->{users}->{$user_id}->{EMAIL});
-
- my @systems = sort { $self->{servers}->{$a}->{NAME} cmp $self->{servers}->{$b}->{NAME} } @{$self->{batch}->{$user_id}};
- $letter->set_tag("system-count" => scalar @systems);
- if (@systems > 1) {
- $letter->set_tag("system-count-verb", "are");
- $letter->set_tag("system-count-plural", "s");
- }
- else {
- $letter->set_tag("system-count-verb", "is");
- $letter->set_tag("system-count-plural", "");
- }
-
- my $affected_list_string;
- for my $system (@systems) {
- $affected_list_string .=
- sprintf("%-32s%s\n", $self->{servers}->{$system}->{NAME}, $self->{servers}->{$system}->{BASE_CHANNEL});
- }
-
- $letter->set_tag("system-affected-list" => $affected_list_string);
- $letter->render;
- $letter->to($self->{users}->{$user_id}->{EMAIL});
- $letter->set_header("X-RHN-Info" => "Autogenerated mail for $self->{users}->{$user_id}->{LOGIN}");
- $letter->set_header("Precedence" => "first-class");
- $letter->set_header("Errors-To" => sprintf('rhn-bounce+%d-%d(a)rhn.redhat.com',
- $user_id,
- $self->{users}->{$user_id}->{ORG_ID}));
- $letter->send;
-}
-
-sub prepare_job {
- my $self = shift;
- my %params = validate(@_, { -dbh => 1 });
- my $dbh = $params{-dbh};
-
- $self->prepare_errata();
- $self->prepare_work_queue(-dbh => $dbh);
- $self->prepare_users(-dbh => $dbh);
- $self->prepare_systems(-dbh => $dbh);
- $self->prepare_batch(-dbh => $dbh);
- $self->prepare_postal();
-}
-
-sub send_all_emails {
- my $self = shift;
- use Time::HiRes qw/time/;
- my $dbh = RHN::DB->connect;
- $self->prepare_job(-dbh => $dbh);
-
- for my $user_id (sort keys %{$self->{batch}}) {
- $self->send_user_email(-user_id => $user_id);
- }
-
- $dbh->do("DELETE FROM rhnPaidErrataTempCache");
-}
-
-1;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 7fc11e3..7af3df9 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -188,7 +188,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/Entitlements.pm
%{perl_vendorlib}/RHN/Errata.pm
%{perl_vendorlib}/RHN/ErrataEditor.pm
-%{perl_vendorlib}/RHN/ErrataMailer.pm
%{perl_vendorlib}/RHN/ErrataTmp.pm
%{perl_vendorlib}/RHN/FileList.pm
%{perl_vendorlib}/RHN/Form.pm
commit f2929c185ec28e70edb981219c957764b77d56e0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:27:26 2009 +0100
Package RHN::DB::Inspector is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Inspector.pm b/web/modules/rhn/RHN/DB/Inspector.pm
deleted file mode 100644
index 96e6845..0000000
--- a/web/modules/rhn/RHN/DB/Inspector.pm
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package RHN::DB::Inspector;
-
-use RHN::DB;
-
-use Data::Dumper;
-
-
-# returns [ org_id, org_name, user_id, first_names, last_name, login, email ]
-sub find_org_by_user {
- my $class = shift;
- my %params = @_;
-# my $search_str = shift;
-
- my ($lower, $upper, $total_ref, $search_str) =
- map { $params{"-" . $_} } qw/lower upper total_rows search_str/;
-
-
- my $dbh = RHN::DB->connect();
- my $query;
- my $sth;
- my $where_clause;
-
- if ($search_str =~ /[*%]/g) {
- $search_str =~ s/\*/%/g;
-# $where_clause = "UPPER(S.name) LIKE UPPER(?)";
- }
-# else {
-# $where_clause = "S.name = ?";
-# }
-
- $query = <<EOQ;
-SELECT WC.org_id, WC.login, WC.id, PI.email
- FROM web_user_personal_info PI, web_contact WC
- WHERE (WC.login_uc LIKE UPPER(?) OR PI.email LIKE UPPER(?))
- AND WC.id = PI.web_user_id
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($search_str, $search_str);
-
- my @ret;
- $$total_ref = 0;
- my $i = 1;
- while( my @row = $sth->fetchrow) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
- push @ret, [ @row ];
- }
- $i++;
- }
- $sth->finish;
-
- return @ret;
-}
-
-# returns [ org_id, org_name, server_id, server_name ]
-# based on search for server name
-# NOTE: SLOW!
-sub find_org_by_server_name {
- my $class = shift;
- my %params = @_;
-# my $search_str = shift;
-
- my ($lower, $upper, $total_ref, $search_str) =
- map { $params{"-" . $_} } qw/lower upper total_rows search_str/;
-
-
- my $dbh = RHN::DB->connect();
- my $query;
- my $sth;
- my $where_clause;
-
- if ($search_str =~ /[*%]/g) {
- $search_str =~ s/\*/%/g;
- $where_clause = "UPPER(S.name) LIKE UPPER(?)";
- }
- else {
- $where_clause = "S.name = ?";
- }
-
- $query = <<EOQ;
-SELECT O.id, O.name, S.id, S.name
- FROM web_customer O, rhnServer S
- WHERE $where_clause
- AND S.org_id = O.id
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($search_str);
-
- my @ret;
- $$total_ref = 0;
- my $i = 1;
- while( my @row = $sth->fetchrow) {
- $$total_ref = $i;
- if ($i >= $lower and $i <= $upper) {
- push @ret, [ @row ];
- }
- $i++;
- }
-
- $sth->finish;
-
- return @ret;
-}
-
-1;
commit 1cfd0c47b66c953145d3e4306d29c0fb9808abe3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:26:12 2009 +0100
Package RHN::DataSource::ContactGroup is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DataSource/ContactGroup.pm b/web/modules/rhn/RHN/DataSource/ContactGroup.pm
deleted file mode 100644
index 772ef37..0000000
--- a/web/modules/rhn/RHN/DataSource/ContactGroup.pm
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-package RHN::DataSource::ContactGroup;
-
-use RHN::DataSource;
-
-our @ISA = qw/RHN::DataSource/;
-
-sub data_file { 'contact_group_queries.xml' }
-1;
commit 965ae43d44be481123e2c3dfa32e47629dbd6c0e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:22:19 2009 +0100
Package RHN::AppInstall::Process::Step::Requirements::Requirement is not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements/Requirement.pm b/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements/Requirement.pm
deleted file mode 100644
index 168b68b..0000000
--- a/web/modules/rhn/RHN/AppInstall/Process/Step/Requirements/Requirement.pm
+++ /dev/null
@@ -1,108 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-package RHN::AppInstall::Process::Step::Requirements::Requirement;
-
-use strict;
-
-use RHN::Exception qw/throw/;
-use Params::Validate qw/:all/;
-Params::Validate::validation_options(strip_leading => "-");
-
-my %valid_fields = (acl => 0,
- argument => 0,
- name => 1,
- );
-
-sub valid_fields {
- return %valid_fields;
-}
-
-sub new {
- my $class = shift;
- my %fields = $class->valid_fields();
- my %attr = validate(@_, \%fields);
-
- my $self = bless { map { ( $_, undef ) } keys(%fields),
- }, $class;
-
- foreach (keys %attr) {
- my $func = "set_${_}";
- throw "Invalid function: $func"
- unless $self->can($func);
-
- $self->$func($attr{$_});
- }
-
- return $self;
-}
-
-# A requirement is really just an ACL by another name.
-# Turn this requirement into an ACL
-sub as_acl {
- my $self = shift;
-
- my $name = $self->get_name();
- $name =~ s/-/_/g;
-
- return sprintf("%s(%s)", $name, $self->get_argument());
-}
-
-sub get_acl {
- my $self = shift;
-
- return $self->{acl};
-}
-
-sub set_acl {
- my $self = shift;
- my $acl = shift;
-
- $self->{acl} = $acl;
-
- return;
-}
-
-sub get_argument {
- my $self = shift;
-
- return $self->{argument};
-}
-
-sub set_argument {
- my $self = shift;
- my $argument = shift;
-
- $self->{argument} = $argument;
-
- return;
-}
-
-sub get_name {
- my $self = shift;
-
- return $self->{name};
-}
-
-sub set_name {
- my $self = shift;
- my $name = shift;
-
- $self->{name} = $name;
-
- return;
-}
-
-1;
commit 31bc1934d865aab9a769d4ddd121ce491a80d5db
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:15:38 2009 +0100
Package PXT::Lint is not used anywhere, removing as dead code.
diff --git a/web/modules/pxt/PXT/Lint.pm b/web/modules/pxt/PXT/Lint.pm
deleted file mode 100644
index 3226c0f..0000000
--- a/web/modules/pxt/PXT/Lint.pm
+++ /dev/null
@@ -1,48 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-package PXT::Lint;
-
-use Data::Dumper;
-
-my %calls;
-sub swaddle_package {
- my $class = shift;
- my $package = shift;
-
- my $chash = eval "\\%${package}::";
-
- for my $func (grep { *{$chash->{$_}}{CODE} } keys %$chash) {
- my ($package, $name, $cref) = map { *{$chash->{$func}}{$_} } qw/PACKAGE NAME CODE/;
-
- # prevent warning of subroutine redefinition
- local $^W = 0;
- $calls{"${package}::${name}"} = 0;
- $chash->{$func} = sub { $calls{"${package}::${name}"}++; goto &$cref };
- }
-
- warn "Swaddled package: $package";
-}
-
-sub dump_empty_calls {
- my $class = shift;
-
- for my $func (sort grep { $calls{$_} == 0 } keys %calls) {
- warn "$func: $calls{$func}";
- }
-}
-
-1;
commit 61689fa154499faea88786c2bb64da8ee749b804
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:14:26 2009 +0100
Package Grail::Application is not used anywhere (and not very useful either), removing as dead code.
diff --git a/web/modules/grail/Grail/Application.pm b/web/modules/grail/Grail/Application.pm
deleted file mode 100644
index 6233004..0000000
--- a/web/modules/grail/Grail/Application.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Grail::Application;
-
-1;
commit 4462fefab0149e59bc75c1e74dee13773a249311
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 10:13:58 2009 +0100
Package Dobby::Env is not used anywhere (and not very useful either), removing as dead code.
diff --git a/web/modules/dobby/Dobby/Env.pm b/web/modules/dobby/Dobby/Env.pm
deleted file mode 100644
index b678c46..0000000
--- a/web/modules/dobby/Dobby/Env.pm
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-package Dobby::Env;
-
-1;
14 years, 5 months
Changes to 'refs/tags/rhn-client-tools-0.8.2-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.8.2-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-15 09:25 +0000
Tagging package [rhn-client-tools] version [0.8.2-1] in directory [client/rhel/rhn-client-tools/].
Changes since rhn-client-tools-0.8.1-1:
Jan Pazdziora (26):
Add defattr to spacewalk-reports.spec.
rhn-help-link not used anywhere, removing, as well as rhn_help_link.
rhn-html-meta-refresh not used anywhere, removing, that rhn_html_meta_refresh does not exist anyway.
rhn-server-child-channel-interface not used anywhere, removing, as well as server_child_channel_interface.
Removal of server_child_channel_interface makes user_server_channels_info unused, removing as dead code.
rhn-resubscribe-* not used anywhere, removing, as well as resubscribe*_warning_sdc.
rhn-server-base-channel not used anywhere, removing, as well as server_base_channel.
rhn-server-child-channels not used anywhere, removing, as well as server_child_channels.
rhn-tri-state-system-entitlement-list not used anywhere, removing, as well as tri_state_system_entitlement_list.
rhn-server-status-interface not used anywhere, removing, as well as server_status_interface.
Removal of server_status_interface makes last_checked_in_days_ago and applicable_errata_counts unused, removing as dead code.
rhn-entitlement-count not used anywhere, removing, as well as entitlement_count.
rhn-check-config-client not used anywhere, removing, as well as check_config_client.
rhn-server-virtualization-guest-details not used anywhere, removing, as well as server_virtualization_details.
Package Sniglets::XMLRPCTest is not used anywhere, removing as dead code.
rhn-profile-create-from-system not used anywhere, removing, as well as profile_create_from_system.
rhn-compat-profile-select not used anywhere, removing, as well as compat_profile_select.
rhn-compat-system-select not used anywhere, removing, as well as compat_system_select.
rhn-profile-name not used anywhere, removing, as well as profile_name.
rhn-profile-edit not used anywhere, removing, as well as profile_edit.
rhn-profile-or-system-details not used anywhere, removing, as well as profile_or_system_details.
rhn-profile-sync-confirm not used anywhere, removing, as well as profile_sync_confirm.
rhn-user-default-system-groups-form not used anywhere, removing, as well as default_system_groups.
grail-title not used anywhere, removing, as well as title_handler.
grail-canvas-template-hack not used anywhere, removing.
grail-dynamic-canvas not used anywhere, removing, as well as dynamic_canvas_handler.
Joshua Roys (1):
Fix typo preventing Solaris up2date from working
Michael Mraka (1):
fixed import of pre-sha256 satellite/hosted exports
Miroslav Suchý (2):
546312 - fixing typos and runtime errors
Automatic commit of package [rhn-client-tools] release [0.8.2-1].
---
backend/server/importlib/packageImport.py | 6
backend/server/rhnServer/server_solarispatches.py | 2
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 7
rel-eng/packages/rhn-client-tools | 2
reporting/spacewalk-reports.spec | 1
web/modules/grail/Grail/Frame.pm | 27
web/modules/rhn/RHN/DB/Server.pm | 81 --
web/modules/sniglets/Sniglets/HTML.pm | 17
web/modules/sniglets/Sniglets/Profiles.pm | 183 ------
web/modules/sniglets/Sniglets/Servers.pm | 349 ------------
web/modules/sniglets/Sniglets/Users.pm | 18
web/modules/sniglets/Sniglets/XMLRPCTest.pm | 66 --
13 files changed, 13 insertions(+), 750 deletions(-)
---
14 years, 5 months
client/rhel rel-eng/packages
by Miroslav Suchý
client/rhel/rhn-client-tools/rhn-client-tools.spec | 4 ++--
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 41136b8b2f04e89089f987907907726cd71a9c7c
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Dec 15 10:25:36 2009 +0100
Automatic commit of package [rhn-client-tools] release [0.8.2-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index e2cb36c..f0bf203 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 0.8.1
+Version: 0.8.2
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if 0%{?suse_version: %{suse_version} > 1000}
@@ -227,7 +227,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/applications/rhn_register.desktop
%changelog
-* Mon Dec 14 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.8.1-1
+* Tue Dec 15 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.8.2-1
- 546312 - do not depend on hald for rhnreg_ks
* Tue Dec 1 2009 Miroslav Suchý <msuchy(a)redhat.com> 0.7.11-1
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index e89f54c..53ce0a7 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-0.8.1-1 client/rhel/rhn-client-tools/
+0.8.2-1 client/rhel/rhn-client-tools/
14 years, 5 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
New commits:
commit 4347495358bc4e38d7d35ee86f1e3ade10897ad3
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Dec 15 10:24:16 2009 +0100
546312 - fixing typos and runtime errors
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
index 2b6d9cc..3d11bb3 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/hardware.py
@@ -107,13 +107,14 @@ _dmi_not_available = 0
def _initialize_dmi_data():
""" Initialize _dmi_data unless it already exist and returns it """
+ global _dmi_data, _dmi_not_available
if _dmi_data is None:
if _dmi_not_available:
# do not try to initialize it again and again if not available
return None
else :
dmixml = dmidecode.dmidecodeXML()
- dmixml = _dmi_data.SetResultType(dmidecode.DMIXML_DOC)
+ dmixml = dmixml.SetResultType(dmidecode.DMIXML_DOC)
# Get all the DMI data and prepare a XPath context
try:
data = dmixml.QuerySection('all')
@@ -139,13 +140,13 @@ def get_dmi_data(path):
# The path do not exist
return ''
-def dmi_vendor();
+def dmi_vendor():
""" Return Vendor from dmidecode bios information.
If this value could not be fetch, returns empty string.
"""
return get_dmi_data('/dmidecode/BIOSInfo/Vendor')
-def dmi_system_uuid();
+def dmi_system_uuid():
""" Return UUID from dmidecode system information.
If this value could not be fetch, returns empty string.
"""
14 years, 5 months
2 commits - backend/server
by Michael Mraka
backend/server/importlib/packageImport.py | 6 ++++--
backend/server/rhnServer/server_solarispatches.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit b12b12adefb8be0aef220dfbcba95a73b18ff89b
Author: Joshua Roys <joshua.roys(a)gtri.gatech.edu>
Date: Mon Dec 14 16:17:30 2009 -0500
Fix typo preventing Solaris up2date from working
diff --git a/backend/server/rhnServer/server_solarispatches.py b/backend/server/rhnServer/server_solarispatches.py
index 90aa112..6edd351 100644
--- a/backend/server/rhnServer/server_solarispatches.py
+++ b/backend/server/rhnServer/server_solarispatches.py
@@ -27,7 +27,7 @@ def get_package_id(pkg):
"""Lookup a package id from rhnPackage in the database,
Return the id or return None if the package is not found"""
- p = dbPackage(entry)
+ p = dbPackage(pkg)
query = """SELECT id FROM rhnPackage
WHERE name_id=LOOKUP_PACKAGE_NAME(:name)
commit 059099214308373e472b40a1ad6aedc61c4a98c0
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 14 16:47:15 2009 +0100
fixed import of pre-sha256 satellite/hosted exports
diff --git a/backend/server/importlib/packageImport.py b/backend/server/importlib/packageImport.py
index b7975d0..cb89e06 100644
--- a/backend/server/importlib/packageImport.py
+++ b/backend/server/importlib/packageImport.py
@@ -252,14 +252,16 @@ class PackageImport(ChannelPackageSubscription):
self.capabilities[nv] = None
# Process files too
fileList = package['files']
- checksum_type = package['checksum'][0]
for f in fileList:
nv = (f['name'], '')
del f['name']
f['capability'] = nv
if not self.capabilities.has_key(nv):
self.capabilities[nv] = None
- fchecksum = (checksum_type, f['filedigest'])
+ if 'md5' in f: # old pre-sha256 export
+ fchecksum = ('md5', f['md5'])
+ else:
+ fchecksum = (f['checksum_type'], f['checksum'])
f['checksum'] = fchecksum
if not self.checksums.has_key(fchecksum):
self.checksums[fchecksum] = None
14 years, 5 months
25 commits - web/modules
by Jan Pazdziora
web/modules/grail/Grail/Frame.pm | 27 --
web/modules/rhn/RHN/DB/Server.pm | 81 ------
web/modules/sniglets/Sniglets/HTML.pm | 17 -
web/modules/sniglets/Sniglets/Profiles.pm | 183 --------------
web/modules/sniglets/Sniglets/Servers.pm | 349 ----------------------------
web/modules/sniglets/Sniglets/Users.pm | 18 -
web/modules/sniglets/Sniglets/XMLRPCTest.pm | 66 -----
7 files changed, 741 deletions(-)
New commits:
commit dcb989ad7494d78f886b8f59bfb496870d821b6a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:47:05 2009 +0100
grail-dynamic-canvas not used anywhere, removing, as well as dynamic_canvas_handler.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 860fa22..873f8ad 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -27,7 +27,6 @@ sub register_tags {
$pxt->register_tag("grail-early-canvas" => \&canvas_handler, -101);
$pxt->register_tag("grail-canvas-template" => \&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-replacement" => \&canvas_replacement_handler, 50);
- $pxt->register_tag("grail-dynamic-canvas" => \&dynamic_canvas_handler, -150);
}
sub register_callbacks {
@@ -52,23 +51,6 @@ sub canvas_handler {
return $canvas->render($pxt, -mode => "render_canvas", -params => [ $params{mode}, $params{__block__} ]);
}
-sub dynamic_canvas_handler {
- my $pxt = shift;
- my %params = @_;
-
- my $canvas = new Grail::Canvas;
-
- my $replacements = $pxt->pnotes('canvas_replacements') || {};
-
- if ($params{mode} and exists $replacements->{$params{mode}}) {
- $params{__block__} = $replacements->{$params{mode}};
- return $canvas->render($pxt, -mode => "render_canvas", -params => [ $params{mode}, $params{__block__} ]);
- }
- else {
- return $canvas->render($pxt, -mode => "render_dynamic_canvas", -params => [ $params{mode}, $params{__block__} ]);
- }
-}
-
sub canvas_replacement_handler {
my $pxt = shift;
my %params = @_;
commit 198a61ed424e437173e4838ed16ed24a89019199
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:46:24 2009 +0100
grail-canvas-template-hack not used anywhere, removing.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index 36366f2..860fa22 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -26,7 +26,6 @@ sub register_tags {
$pxt->register_tag("grail-canvas" => \&canvas_handler, -100);
$pxt->register_tag("grail-early-canvas" => \&canvas_handler, -101);
$pxt->register_tag("grail-canvas-template" => \&canvas_template_handler, 100);
- $pxt->register_tag("grail-canvas-template-hack" => \&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-replacement" => \&canvas_replacement_handler, 50);
$pxt->register_tag("grail-dynamic-canvas" => \&dynamic_canvas_handler, -150);
}
commit afe80957d3642c8de5bfce55ca8947de7484309c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:45:33 2009 +0100
grail-title not used anywhere, removing, as well as title_handler.
diff --git a/web/modules/grail/Grail/Frame.pm b/web/modules/grail/Grail/Frame.pm
index baedb3b..36366f2 100644
--- a/web/modules/grail/Grail/Frame.pm
+++ b/web/modules/grail/Grail/Frame.pm
@@ -24,7 +24,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag("grail-canvas" => \&canvas_handler, -100);
- $pxt->register_tag("grail-title" => \&title_handler, -100);
$pxt->register_tag("grail-early-canvas" => \&canvas_handler, -101);
$pxt->register_tag("grail-canvas-template" => \&canvas_template_handler, 100);
$pxt->register_tag("grail-canvas-template-hack" => \&canvas_template_handler, 100);
@@ -54,13 +53,6 @@ sub canvas_handler {
return $canvas->render($pxt, -mode => "render_canvas", -params => [ $params{mode}, $params{__block__} ]);
}
-sub title_handler {
- my $pxt = shift;
- my %params = @_;
-
- return "<TITLE>" . ($pxt->pnotes('page_title') || $params{__block__}) . "</TITLE>";
-}
-
sub dynamic_canvas_handler {
my $pxt = shift;
my %params = @_;
commit bcc513416ecbbaf50eb324c84163627904291c0f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:44:22 2009 +0100
rhn-user-default-system-groups-form not used anywhere, removing, as well as default_system_groups.
diff --git a/web/modules/sniglets/Sniglets/Users.pm b/web/modules/sniglets/Sniglets/Users.pm
index 56bb925..ae41897 100644
--- a/web/modules/sniglets/Sniglets/Users.pm
+++ b/web/modules/sniglets/Sniglets/Users.pm
@@ -62,8 +62,6 @@ sub register_tags {
$pxt->register_tag('rhn-user-site-view' => \&user_site_view);
$pxt->register_tag('rhn-user-login' => \&rhn_user_login);
-
- $pxt->register_tag('rhn-user-default-system-groups-form' => \&default_system_groups);
}
sub register_callbacks {
@@ -1270,22 +1268,6 @@ sub rhn_user_login {
return $user->login;
}
-sub default_system_groups {
- my $pxt = shift;
- my %attr = @_;
-
- my $form = build_default_system_groups_form($pxt, %attr);
- my $rform = $form->realize;
- undef $form;
-
- Sniglets::Forms::load_params($pxt, $rform);
-
- my $style = new Sniglets::Forms::Style;
- my $html = $rform->render($style);
-
- return $html;
-}
-
sub default_system_groups_cb {
my $pxt = shift;
commit 37af489fef5f5119ca40e43a90c2ba1e5354e79b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:40:54 2009 +0100
rhn-profile-sync-confirm not used anywhere, removing, as well as profile_sync_confirm.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 66d5a4b..84b4ea3 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-sync-confirm' => \&profile_sync_confirm);
}
sub register_callbacks {
@@ -131,38 +130,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub profile_sync_confirm {
- my $pxt = shift;
- my %params = @_;
-
- my $copy = $params{__block__};
-
- my $source;
- my $source_profile_id = $pxt->param('prid');
- my $source_system_id = $pxt->param('sid_1');
-
- my $victim = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- if ($source_profile_id) {
- $source = RHN::Profile->lookup(-id => $source_profile_id);
- }
- elsif ($source_system_id) {
- $source = RHN::Server->lookup(-id => $source_system_id);
- }
- else {
- die 'no source for sync operation?';
- }
-
-
- my %subst;
- $subst{source} = $source->name;
- $subst{victim} = $victim->name;
-
- $copy = PXT::Utils->perform_substitutions($copy, \%subst);
-
- return $copy;
-}
-
sub sync_server_cb {
my $pxt = shift;
my $missing_packages_option = shift || '';
commit f1151301bc4477265558b639142d61a65add6cd0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:40:13 2009 +0100
rhn-profile-or-system-details not used anywhere, removing, as well as profile_or_system_details.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 475980b..66d5a4b 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-or-system-details' => \&profile_or_system_details, -5);
-
$pxt->register_tag('rhn-profile-sync-confirm' => \&profile_sync_confirm);
}
@@ -57,39 +55,6 @@ sub profile_edit_cb {
$pxt->redirect("details.pxt", prid => $profile->id);
}
-sub profile_or_system_details {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid_1') || '';
- my $prid = $pxt->param('prid') || '';
-
- throw "Either (sid_1) or (prid) param required" unless ($sid || $prid);
-
- my %subst;
-
- if ($sid) {
- my $system = RHN::Server->lookup(-id => $sid);
- throw "no valid server" unless $system;
-
- $subst{profile_or_system_name} = $system->name;
- $subst{profile_or_system_description} = $system->description;
- }
- else {
- my $profile = RHN::Profile->lookup(-id => $prid);
- throw "No valid profile" unless $profile;
-
- $subst{profile_or_system_name} = $profile->name;
- $subst{profile_or_system_description} = $profile->description;
- }
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- my $block = PXT::Utils->perform_substitutions($params{__block__}, \%subst);
-
- return $block;
-}
-
sub create_profile_from_system_cb {
my $pxt = shift;
commit 9c090cedae16003a0ecf492249cdc0e6fa9a0e88
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:39:38 2009 +0100
rhn-profile-edit not used anywhere, removing, as well as profile_edit.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 61c7afb..475980b 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-edit' => \&profile_edit);
-
$pxt->register_tag('rhn-profile-or-system-details' => \&profile_or_system_details, -5);
$pxt->register_tag('rhn-profile-sync-confirm' => \&profile_sync_confirm);
@@ -48,20 +46,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:create_profile_from_system_cb' => \&create_profile_from_system_cb);
}
-sub profile_edit {
- my $pxt = shift;
- my %params = @_;
-
- my $profile = RHN::Profile->lookup(-id => $pxt->param('prid'));
-
- my $block = $params{__block__};
- my %subst;
- $subst{profile_name} = $profile->name;
- $subst{profile_description} = $profile->description;
-
- return PXT::Utils->perform_substitutions($block, \%subst);
-}
-
sub profile_edit_cb {
my $pxt = shift;
commit 58dd3a2b9e3a8ef0491e879ade7644c30e88b8b0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:38:54 2009 +0100
rhn-profile-name not used anywhere, removing, as well as profile_name.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 1aa6122..61c7afb 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
$pxt->register_tag('rhn-profile-or-system-details' => \&profile_or_system_details, -5);
@@ -49,23 +48,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:create_profile_from_system_cb' => \&create_profile_from_system_cb);
}
-sub profile_name {
- my $pxt = shift;
- my %params = @_;
-
- my $prid = $params{prid} || $pxt->param('prid');
-
- throw 'No profile id' unless $prid;
-
- $pxt->user->verify_system_profile_access($prid)
- or $pxt->redirect('/errors/permission.pxt');
-
- my $block = $params{__block__};
- my $p = RHN::Profile->lookup(-id => $prid);
-
- return PXT::Utils->escapeHTML($p->name);
-}
-
sub profile_edit {
my $pxt = shift;
my %params = @_;
commit 2974faad9d2b832c0d524f672171986ccd859337
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:37:01 2009 +0100
rhn-compat-system-select not used anywhere, removing, as well as compat_system_select.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index a8b8ffe..1aa6122 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-compat-system-select' => \&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
@@ -201,30 +200,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub compat_system_select {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid');
- my $ret = $params{__block__};
-
- my $empty_msg = $params{empty_message} || '';
- throw 'param empty_message needed but not provided.'
- unless $empty_msg;
-
- my @systems = RHN::Server->compatible_with_server($sid, $pxt->user->id, $pxt->user->org_id);
- my @options = map { [ PXT::Utils->escapeHTML($_->[1] || ''), $_->[0], 0 ] } @systems;
-
- if (@options) {
- $ret =~ s/\{system_select\}/PXT::HTML->select(-name => 'sid_1', -options => \@options)/e;
- }
- else {
- $ret = $empty_msg;
- }
-
- return $ret;
-}
-
sub profile_sync_confirm {
my $pxt = shift;
my %params = @_;
commit ee95841a1277d1999a7cc79acc0a6009c9baf4ae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:36:10 2009 +0100
rhn-compat-profile-select not used anywhere, removing, as well as compat_profile_select.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 62c8dee..a8b8ffe 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,7 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-compat-profile-select' => \&compat_profile_select);
$pxt->register_tag('rhn-compat-system-select' => \&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
$pxt->register_tag('rhn-profile-edit' => \&profile_edit);
@@ -202,30 +201,6 @@ sub profile_delete_cb {
$pxt->redirect($redir, ($sid ? (sid => $sid) : ()));
}
-sub compat_profile_select {
- my $pxt = shift;
- my %params = @_;
-
- my $sid = $pxt->param('sid');
- my $ret = $params{__block__};
-
- my $empty_msg = $params{empty_message} || '';
- throw 'param empty_message needed but not provided.'
- unless $empty_msg;
-
- my @profiles = RHN::Profile->compatible_with_server($sid, $pxt->user->org_id);
- my @options = map { [ PXT::Utils->escapeHTML($_->[1] || ''), $_->[0], 0 ] } @profiles;
-
- if (@options) {
- $ret =~ s/\{profile_select\}/PXT::HTML->select(-name => 'prid', -options => \@options)/e;
- }
- else {
- $ret = $empty_msg;
- }
-
- return $ret;
-}
-
sub compat_system_select {
my $pxt = shift;
my %params = @_;
commit 0a085d1550da42694b747db31a68e0ea3f4f93ce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:35:26 2009 +0100
rhn-profile-create-from-system not used anywhere, removing, as well as profile_create_from_system.
diff --git a/web/modules/sniglets/Sniglets/Profiles.pm b/web/modules/sniglets/Sniglets/Profiles.pm
index 3b727de..62c8dee 100644
--- a/web/modules/sniglets/Sniglets/Profiles.pm
+++ b/web/modules/sniglets/Sniglets/Profiles.pm
@@ -30,8 +30,6 @@ sub register_tags {
my $class = shift;
my $pxt = shift;
- $pxt->register_tag('rhn-profile-create-from-system' => \&profile_create_from_system);
-
$pxt->register_tag('rhn-compat-profile-select' => \&compat_profile_select);
$pxt->register_tag('rhn-compat-system-select' => \&compat_system_select);
$pxt->register_tag('rhn-profile-name' => \&profile_name, -2);
@@ -128,35 +126,6 @@ sub profile_or_system_details {
return $block;
}
-sub profile_create_from_system {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my %subst;
-
- my $system = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- throw 'no system.' unless $system;
-
- $subst{profile_create_name} =
- PXT::HTML->text(-name => 'name',
- -value => "Profile of " . PXT::Utils->escapeHTML($system->name || ''),
- -maxlength => 128,
- -size => 48);
-
- $subst{profile_create_description} =
- PXT::HTML->textarea(-name => 'description',
- -value => "Profile made from " . PXT::Utils->escapeHTML($system->name || ''),
- -rows => 6,
- -cols => 48,
- -wrap => 'VIRTUAL');
-
- $block = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $block;
-}
-
sub create_profile_from_system_cb {
my $pxt = shift;
commit 01cb9ba98ef7f160b6d0eda413ed2bf81ba5ba02
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:32:24 2009 +0100
Package Sniglets::XMLRPCTest is not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/XMLRPCTest.pm b/web/modules/sniglets/Sniglets/XMLRPCTest.pm
deleted file mode 100644
index e0e24de..0000000
--- a/web/modules/sniglets/Sniglets/XMLRPCTest.pm
+++ /dev/null
@@ -1,66 +0,0 @@
-#
-# Copyright (c) 2008 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public License,
-# version 2 (GPLv2). There is NO WARRANTY for this software, express or
-# implied, including the implied warranties of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
-# along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-# Red Hat trademarks are not licensed under GPLv2. No permission is
-# granted to use or replicate Red Hat trademarks that are incorporated
-# in this software or its documentation.
-#
-
-use strict;
-
-package Sniglets::XMLRPCTest;
-
-sub register_xmlrpc {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_xmlrpc("listdir", \&listdir_xmlrpc);
-}
-
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_tag("listdir", \&listdir_tag);
-}
-
-sub listdir_tag {
- my $pxt = shift;
-
- my $ret;
-
- foreach my $dir (generate_dir_listing($pxt->param("dir") || "/tmp")) {
- $ret .= "$dir->[0]<br>";
- }
-
- return $ret;
-}
-
-# return a list of files in a dir, w/o extra info
-sub listdir_xmlrpc {
- my $pxt = shift;
- my $dir = shift;
-
- return map { $_->[0] } generate_dir_listing($dir);
-}
-
-# return a list of files in a dir, including stat() info
-sub generate_dir_listing {
- my $dir = shift;
-
- opendir D, $dir
- or die "can't open dir: $!";
- my @dir = readdir D;
- closedir D;
-
- return map { [ $_, stat("$dir/$_") ] } @dir;
-}
-
-1;
commit e2ec07971885dd3c54d429e46ee3db3f9214190a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:28:44 2009 +0100
rhn-server-virtualization-guest-details not used anywhere, removing, as well as server_virtualization_details.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 0cdeaa7..5d74233 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -82,8 +82,6 @@ sub register_tags {
$pxt->register_tag('rhn-system-activation-key-form' => \&system_activation_key_form);
$pxt->register_tag('rhn-remote-command-form' => \&remote_command_form);
-
- $pxt->register_tag('rhn-server-virtualization-guest-details' => \&server_virtualization_details, 2);
}
sub register_callbacks {
@@ -655,47 +653,6 @@ sub server_history_event_details {
return $params{__block__};
}
-sub server_virtualization_details {
- my $pxt = shift;
- my %params = @_;
- my $ret = '';
-
- my $server = $pxt->pnotes('server');
-
- throw "No server." unless $server;
-
- my %subst;
-
- my $virt_details = $server->virtual_guest_details();
-
- return unless $virt_details;
-
- my $block = $params{__block__};
-
- $subst{virtualization_type} = $virt_details->{TYPE_NAME} || "None";
- $subst{virtualization_uuid} = $virt_details->{UUID} || "Unknown";
- $subst{virtualization_host} = "Unknown";
-
- if ($virt_details->{HOST_SYSTEM_ID}) {
- if ($pxt->user->verify_system_access($virt_details->{HOST_SYSTEM_ID})) {
- $subst{virtualization_host} =
- PXT::HTML->link2(text => $virt_details->{HOST_SYSTEM_NAME},
- url => "/rhn/systems/details/Overview.do?sid=" . $virt_details->{HOST_SYSTEM_ID});
-
- }
- else {
- $subst{virtualization_host} = sprintf("%s (%d)",
- $virt_details->{HOST_SYSTEM_NAME},
- $virt_details->{HOST_SYSTEM_ID});
-
- }
- }
-
- my $html = PXT::Utils->perform_substitutions($block, \%subst);
-
- return $html;
-}
-
sub base_entitlement {
my $pxt = shift;
my $server = shift;
commit c9aa23c535c88926a4cc44566c1255e5f9430439
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:27:41 2009 +0100
rhn-check-config-client not used anywhere, removing, as well as check_config_client.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 777ef81..0cdeaa7 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -81,8 +81,6 @@ sub register_tags {
$pxt->register_tag('rhn-system-pending-actions-count' => \&system_pending_actions_count);
$pxt->register_tag('rhn-system-activation-key-form' => \&system_activation_key_form);
- $pxt->register_tag('rhn-check-config-client' => \&check_config_client);
-
$pxt->register_tag('rhn-remote-command-form' => \&remote_command_form);
$pxt->register_tag('rhn-server-virtualization-guest-details' => \&server_virtualization_details, 2);
@@ -1778,20 +1776,6 @@ sub ks_session_redir {
return;
}
-sub check_config_client {
- my $pxt = shift;
-
- my $server = RHN::Server->lookup(-id => $pxt->param('sid'));
-
- # can't just push_message since there are odd redirects going on with the navi selected node code
- if (not $server->client_capable('configfiles.deploy')) {
- return '<div class="local-alert">This system does not have the "rhncfg-actions" package; scheduled actions will fail until it is installed.</div>';
- }
- else {
- return '';
- }
-}
-
sub remote_command_form {
my $pxt = shift;
my %attr = @_;
commit d61bc4f67743fa135dc03e22774dcbe589754e45
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:26:03 2009 +0100
rhn-entitlement-count not used anywhere, removing, as well as entitlement_count.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index d03ced6..777ef81 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -78,7 +78,6 @@ sub register_tags {
$pxt->register_tag('rhn-proxy-entitlement-form' => \&proxy_entitlement_form);
- $pxt->register_tag('rhn-entitlement-count' => \&entitlement_count);
$pxt->register_tag('rhn-system-pending-actions-count' => \&system_pending_actions_count);
$pxt->register_tag('rhn-system-activation-key-form' => \&system_activation_key_form);
@@ -1552,74 +1551,6 @@ sub system_base_channel_select {
-options => \@options);
}
-sub entitlement_count {
- my $pxt = shift;
- my %params = @_;
-
- my $ent_data = $pxt->user->org->entitlement_data;
-
- my ($ret, $ret_wg, $ret_prov, $ret_mon, $ret_nonlinux);
-
- $ret = <<EOQ;
-<h3>Base Entitlements</h3>
-<div class="page-content">
-EOQ
-
- if (not PXT::Config->get("satellite")) {
- $ret .= sprintf('%s Service: You have <strong>%d subscription%s</strong>',
- $pxt->user->org->basic_slot_name(),
- $ent_data->{sw_mgr_entitled}->{max},
- $ent_data->{sw_mgr_entitled}->{max} == 1 ? '' : 's',
- );
- $ret .= sprintf(', and you have <strong>%d system%s subscribed</strong>.<br/>',
- $ent_data->{sw_mgr_entitled}->{used},
- $ent_data->{sw_mgr_entitled}->{used} == 1 ? '' : 's');
- }
-
- $ret_wg .= sprintf('Management Service: You have <strong>%d subscription%s</strong>',
- $ent_data->{enterprise_entitled}->{max},
- $ent_data->{enterprise_entitled}->{max} == 1 ? '' : 's');
-
- $ret_wg .= sprintf(', and you have <strong>%d system%s subscribed</strong>.<br/>',
- $ent_data->{enterprise_entitled}->{used},
- $ent_data->{enterprise_entitled}->{used} == 1 ? '' : 's');
-
- $ret_prov .= sprintf('Provisioning Service: You have <strong>%d subscription%s</strong>',
- $ent_data->{provisioning_entitled}->{max},
- $ent_data->{provisioning_entitled}->{max} == 1 ? '' : 's');
- $ret_prov .= sprintf(', and you have <strong>%d system%s subscribed</strong>.<br/>',
- $ent_data->{provisioning_entitled}->{used},
- $ent_data->{provisioning_entitled}->{used} == 1 ? '' : 's');
-
- $ret_mon .= sprintf('Monitoring Service: You have <strong>%d subscription%s</strong>',
- $ent_data->{monitoring_entitled}->{max},
- $ent_data->{monitoring_entitled}->{max} == 1 ? '' : 's');
- $ret_mon .= sprintf(', and you have <strong>%d system%s subscribed</strong>.<br/>',
- $ent_data->{monitoring_entitled}->{used},
- $ent_data->{monitoring_entitled}->{used} == 1 ? '' : 's');
-
- if ($ent_data->{enterprise_entitled}->{max} > 0) {
- $ret .= $ret_wg;
- }
-
- $ret .= "</div>\n";
- if ($ent_data->{provisioning_entitled}->{max} > 0 or
- $ent_data->{monitoring_entitled}->{max} > 0) {
- $ret .= <<EOQ;
-<h3>Add-On Entitlements</h3>
-<div class="page-content">
-EOQ
- if ($ent_data->{provisioning_entitled}->{max} > 0) {
- $ret .= $ret_prov;
- }
- if ($ent_data->{monitoring_entitled}->{max} > 0) {
- $ret .= $ret_mon;
- }
- $ret .= "</div>\n";
- }
- return $ret;
-}
-
sub delete_servers_cb {
my $pxt = shift;
commit 36a8a639adade862be388959b6325f99d2f9fa87
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:22:18 2009 +0100
Removal of server_status_interface makes last_checked_in_days_ago and applicable_errata_counts unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 41bcb43..3c03a0e 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -502,29 +502,6 @@ EOQ
}
}
-sub last_checked_in_days_ago {
- my $self = shift;
-
- my $dbh = RHN::DB->connect();
- my $query;
- my $sth;
-
- $query = <<EOQ;
-SELECT sysdate - checkin
- FROM rhnServerInfo
- WHERE server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->id);
-
- my @columns;
- @columns = $sth->fetchrow;
- $sth->finish;
-
- return $columns[0];
-}
-
sub is_proxy {
my $self = shift;
@@ -1077,28 +1054,6 @@ EOQ
}
-sub applicable_errata_counts {
- my $self = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth;
-
- my $query = <<EOQ;
-SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA, OUTDATED_PACKAGES
- FROM rhnServerOverview
- WHERE org_id = ?
- AND server_id = ?
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute($self->org_id, $self->id);
-
- my $row = $sth->fetchrow_hashref;
- $sth->finish;
-
- return $row;
-}
-
sub system_list_count {
my $class = shift;
my $user_id = shift;
commit 0bc67e37547699ae93b96f084e092a7494555559
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:18:12 2009 +0100
rhn-server-status-interface not used anywhere, removing, as well as server_status_interface.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 6973a04..d03ced6 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -74,8 +74,6 @@ sub register_tags {
$pxt->register_tag('rhn-server-history-event-details' => \&server_history_event_details);
- $pxt->register_tag('rhn-server-status-interface' => \&server_status_interface, 10);
-
$pxt->register_tag('rhn-system-base-channel-select' => \&system_base_channel_select);
$pxt->register_tag('rhn-proxy-entitlement-form' => \&proxy_entitlement_form);
@@ -465,45 +463,6 @@ sub server_name {
return PXT::Utils->escapeHTML($server->name);
}
-sub server_status_interface {
- my $pxt = shift;
- my %params = @_;
-
- my $system = $pxt->pnotes('server');
- die "no system!" unless $system;
-
- my $data = $system->applicable_errata_counts();
-
- $data->{ID} = $system->id;
- $data->{IS_ENTITLED} = $system->is_entitled;
- $data->{LAST_CHECKIN_DAYS_AGO} = $system->last_checked_in_days_ago;
- $data->{LOCKED} = $system->check_lock;
-
- my $session = RHN::Kickstart::Session->lookup(-sid => $system->id, -org_id => $pxt->user->org_id, -soft => 1);
- my $state = $session ? $session->session_state_label : '';
- $data->{KICKSTART_SESSION_ID} = ($session and $state ne 'complete' and $state ne 'failed') ? $session->id : undef;
-
- my $subst = system_status_info($pxt->user, $data);
-
- if ($subst->{link}) {
- $subst->{message} = "(" . PXT::HTML->link($subst->{link}, $subst->{message}) . ")";
- }
-
- if ($subst->{image_medium}) {
- $subst->{image_medium} = PXT::HTML->img(-src => $subst->{image_medium}, -alt => $subst->{status_str}, -title => $subst->{status_str});
- }
-
- if ($subst->{image}) {
- $subst->{image} = PXT::HTML->img(-src => $subst->{image}, -alt => $subst->{status_str}, -title => $subst->{status_str});
- }
-
- my $block = $params{__block__};
-
- $block = PXT::Utils->perform_substitutions($block, $subst);
-
- return $block;
-}
-
# not a sniglet
sub system_status_info {
my $user = shift;
commit 9bcf32837e7db2e5056a21b9215af1968d4cc5bd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:16:24 2009 +0100
rhn-tri-state-system-entitlement-list not used anywhere, removing, as well as tri_state_system_entitlement_list.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 0326541..6973a04 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -60,7 +60,6 @@ sub register_tags {
$pxt->register_tag('rhn-server-name' => \&server_name, 2);
$pxt->register_tag('rhn-tri-state-system-pref-list' => \&tri_state_system_pref_list);
- $pxt->register_tag('rhn-tri-state-system-entitlement-list' => \&tri_state_system_entitlement_list);
$pxt->register_tag('rhn-server-hardware-profile' => \&server_hardware_profile);
$pxt->register_tag('rhn-dmi-info' => \&server_dmi_info, 1);
@@ -1460,34 +1459,6 @@ sub tri_state_system_pref_list {
return $html;
}
-sub tri_state_system_entitlement_list {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $html = '';
-
- my $counter = 1;
-
- my @all_entitlements = RHN::Entitlements->valid_system_entitlements_for_org($pxt->user->org_id);
- my @addon_entitlements = grep { $_->{IS_BASE} eq 'N' } @all_entitlements;
-
- foreach my $ent (@addon_entitlements) {
- $counter++;
- my %subst;
-
- $subst{entitlement_name} = $ent->{LABEL};
- $subst{entitlement_label} = $pxt->user->org->slot_name($ent->{LABEL});
- $subst{class} = ($counter % 2) ? "list-row-even" : "list-row-odd";
-
- PXT::Utils->escapeHTML_multi(\%subst);
-
- $html .= PXT::Utils->perform_substitutions($block, \%subst);
- }
-
- return $html;
-}
-
sub ssm_change_system_prefs_cb {
my $pxt = shift;
commit 79bc62ae52fb3589700e5e08472f1941c708ac61
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:15:10 2009 +0100
rhn-server-child-channels not used anywhere, removing, as well as server_child_channels.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 53dec4a..0326541 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,8 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-child-channels' => \&server_child_channels, 3);
-
$pxt->register_tag('rhn-server-prefs-conf-list' => \&server_prefs_conf_list);
$pxt->register_tag('rhn-server-name' => \&server_name, 2);
@@ -209,27 +207,6 @@ sub up2date_at_least {
return '';
}
-# gets the channels from server_base_channel via pnote, 3rd link in chain.
-sub server_child_channels {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $server_channels = $pxt->pnotes('server_channels');
- PXT::Debug->log_dump(7, \$server_channels);
- my $ret = '';
- foreach my $sc (grep { defined $_->{PARENT_CHANNEL} } @{$server_channels}) {
- my %subst = (child_channel_name => PXT::Utils->escapeHTML($sc->{NAME} || ''), child_channel_id => $sc->{ID});
- PXT::Debug->log_dump(\%subst);
- $ret .= PXT::Utils->perform_substitutions($block, \%subst);
- }
-
- PXT::Debug->log(7, "server channels: $ret");
-
- return $ret;
-}
-
sub proxy_entitlement_form {
my $pxt = shift;
my %params = @_;
commit ab66b829c69bcbd54af1959847548bb4452a52a5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:14:32 2009 +0100
rhn-server-base-channel not used anywhere, removing, as well as server_base_channel.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 9384849..53dec4a 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,7 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-base-channel' => \&server_base_channel, 2);
$pxt->register_tag('rhn-server-child-channels' => \&server_child_channels, 3);
$pxt->register_tag('rhn-server-prefs-conf-list' => \&server_prefs_conf_list);
@@ -210,20 +209,6 @@ sub up2date_at_least {
return '';
}
-# gets the channels from the admin_server_edit_form via pnote, 2nd link in chain.
-sub server_base_channel {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
-
- my $server_channels = $pxt->pnotes('server_channels');
-
- my ($base_channel) = grep { not defined $_->{PARENT_CHANNEL} } @{$server_channels};
- $block = PXT::Utils->perform_substitutions($block, {base_id => $base_channel->{ID}, base_name => PXT::Utils->escapeHTML($base_channel->{NAME} || '')});
- return $block;
-}
-
# gets the channels from server_base_channel via pnote, 3rd link in chain.
sub server_child_channels {
my $pxt = shift;
commit 970416782f145ac478b89bd1ff62ca7b6343c08c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:13:35 2009 +0100
rhn-resubscribe-* not used anywhere, removing, as well as resubscribe*_warning_sdc.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 0200390..9384849 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,8 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-resubscribe-warning-sdc' => \&resubscribe_warning_sdc, 3);
- $pxt->register_tag('rhn-resubscribe-base-warning-sdc' => \&resubscribe_base_warning_sdc, 3);
$pxt->register_tag('rhn-server-base-channel' => \&server_base_channel, 2);
$pxt->register_tag('rhn-server-child-channels' => \&server_child_channels, 3);
@@ -157,29 +155,6 @@ sub osa_ping_cb {
$pxt->redirect('/rhn/systems/details/Overview.do?sid=' . $sid . "&message=system.osad.pinged&messagep1=" . $server->name);
}
-sub resubscribe_warning_sdc {
- my $pxt = shift;
- my %params = @_;
-
- if ($pxt->pnotes('resubscribe_warning')) {
- return $params{__block__};
- }
-
- return '';
-}
-
-sub resubscribe_base_warning_sdc {
- my $pxt = shift;
- my %params = @_;
-
- if ($pxt->pnotes('resubscribe_base_warning')) {
- return $params{__block__};
- }
-
- return '';
-}
-
-
sub system_pending_actions_count {
my $pxt = shift;
my %params = @_;
commit fb0b59de533c854ba6159253ef7b3d4c9db335f1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:10:53 2009 +0100
Removal of server_child_channel_interface makes user_server_channels_info unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 1776956..41bcb43 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -1566,42 +1566,6 @@ EOS
}
}
-# return a server's channels in the context of a user...
-# (if unsubscribed, could this user resubscribe the channel?)
-sub user_server_channels_info {
- my $self = shift;
- my $user_id = shift;
-
- my $dbh = RHN::DB->connect;
- my $query = <<EOQ;
-SELECT C.id,
- C.label,
- C.name,
- C.summary,
- (SELECT 1
- FROM rhnUserChannel
- WHERE user_id = WC.id
- AND channel_id = C.id
- AND role = 'subscribe') AS RESUBSCRIBABLE
- FROM rhnChannel C,
- rhnServerChannel SC,
- web_contact WC
- WHERE WC.id = :user_id
- AND C.id = SC.channel_id
- AND SC.server_id = :server_id
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(server_id => $self->id, user_id => $user_id);
-
- my @ret;
- while (my $row = $sth->fetchrow_hashref) {
- push @ret, $row;
- }
-
- return @ret;
-}
-
sub server_channels {
my $self = shift;
commit f33244a69e2a3e9e661293990ceb5a422f6629dc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:09:52 2009 +0100
rhn-server-child-channel-interface not used anywhere, removing, as well as server_child_channel_interface.
diff --git a/web/modules/sniglets/Sniglets/Servers.pm b/web/modules/sniglets/Sniglets/Servers.pm
index 7c79c4f..0200390 100644
--- a/web/modules/sniglets/Sniglets/Servers.pm
+++ b/web/modules/sniglets/Sniglets/Servers.pm
@@ -56,7 +56,6 @@ sub register_tags {
$pxt->register_tag('rhn-up2date-at-least' => \&up2date_at_least);
- $pxt->register_tag('rhn-server-child-channel-interface' => \&server_child_channel_interface, -1);
$pxt->register_tag('rhn-resubscribe-warning-sdc' => \&resubscribe_warning_sdc, 3);
$pxt->register_tag('rhn-resubscribe-base-warning-sdc' => \&resubscribe_base_warning_sdc, 3);
$pxt->register_tag('rhn-server-base-channel' => \&server_base_channel, 2);
@@ -271,93 +270,6 @@ sub server_child_channels {
return $ret;
}
-sub server_child_channel_interface {
- my $pxt = shift;
- my %params = @_;
-
- my $server_id = $pxt->param('sid');
-
- my $server = RHN::Server->lookup(-id => $server_id);
- my $base_chan_id = $server->base_channel_id();
-
- my $block = $params{__block__};
-
- my @server_channels = $server->user_server_channels_info($pxt->user->id);
-
- # save a lookup for subscribed channels for use in loop below... important in warning resubscription...
- my %subscribed = map { $_->{ID} => 1 } @server_channels;
-
- my @subscribable_channels = RHN::Channel->subscribable_channels(server_id => $server_id,
- user_id => $pxt->user->id,
- base_channel_id => $base_chan_id);
-
- my %sat_channels = map { $_ => 1 } RHN::Channel->rhn_satellite_channels();
- my %proxy_channels = map { $_ => 1 } RHN::Channel->rhn_proxy_channels();
-
- # filter out proxy and satellite channels, they're handled by seperate interface,
- # and filter out the base channel as well...
- my @channels = grep { not exists $sat_channels{$_->{ID}} and not exists $proxy_channels{$_->{ID}} and $_->{ID} ne $base_chan_id}
- (@server_channels, @subscribable_channels);
-
- $pxt->pnotes(child_channels_total => scalar @channels);
-
- $block =~ m/<child_channel>(.*?)<\/child_channel>/ism;
- my $child_channel_block = $1;
-
- $child_channel_block =~ m/<gpg_key>(.*?)<\/gpg_key>/ism;
- my $gpg_key_block = $1;
-
- my $child_channels_html = '';
-
- # determines whether we render the guts of rhn-resubscribe-warning
- my $resubscribe_warning;
-
- foreach my $channel (sort { $a->{NAME} cmp $b->{NAME} } @channels) {
- my $current = $child_channel_block;
- my $current_gpg = '';
-
- my %subs;
- $subs{checkbox} = PXT::HTML->checkbox(-name => "child_channel",
- -value => PXT::Utils->escapeHTML($channel->{ID} || ''),
- -checked => ((grep { $_->{LABEL} eq $channel->{LABEL} } @server_channels) ? 1 : 0));
-
- $subs{channel_id} = PXT::Utils->escapeHTML($channel->{ID});
- $subs{channel_name} = PXT::Utils->escapeHTML($channel->{NAME});
- $subs{channel_summary} = PXT::Utils->escapeHTML($channel->{SUMMARY});
- $subs{resubscribe_warning} = '';
-
- if ($subscribed{$channel->{ID}} and not $channel->{RESUBSCRIBABLE}) {
-
- # we'll need to show warning text...
- $resubscribe_warning = 1;
-
- $subs{resubscribe_warning} = PXT::HTML->img(-src => '/img/rhn-listicon-alert.gif',
- -title => 'Resubscription Warning',
- );
-
- $subs{resubscribe_warning} = "<span class=\"resubscribe-warning\">$subs{resubscribe_warning}</span>";
- }
-
- $current = PXT::Utils->perform_substitutions($current, \%subs);
-
- if ($channel->{GPG_KEY_URL}) {
- $current_gpg = $gpg_key_block;
- $current_gpg =~ s{\{gpg_key_url\}}{$pxt->derelative_url("/network/software/channels/details.pxt?cid=" . $channel->{ID}, 'https')}eg;
- }
-
- $current =~ s{<gpg_key>.*?</gpg_key>}{$current_gpg}gis;
- $child_channels_html .= $current;
- }
-
- $block =~ s{<child_channel>.*?</child_channel>}{$child_channels_html}is;
-
- $pxt->pnotes('resubscribe_warning' => 1) if $resubscribe_warning;
- $pxt->pnotes('server_details_subscribable_child_channels_seen' => scalar @channels);
-
- return $block;
-}
-
-
sub proxy_entitlement_form {
my $pxt = shift;
my %params = @_;
commit e12f741f62147fd4e4981070a1461ff2df4142bc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 09:02:31 2009 +0100
rhn-html-meta-refresh not used anywhere, removing, that rhn_html_meta_refresh does not exist anyway.
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index f99a031..020fead 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -42,7 +42,6 @@ sub register_tags {
$pxt->register_tag("rhn-checkable", \&rhn_checkable, 10);
$pxt->register_tag("rhn-autorefresh-widget", \&rhn_autorefresh_widget);
- $pxt->register_tag("rhn-html-meta-refresh", \&rhn_html_meta_refresh);
$pxt->register_tag("rhn-return-link", \&return_link);
}
commit aabb9f3549f135d99a65822b103f4b3fbe21baf6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 08:59:19 2009 +0100
rhn-help-link not used anywhere, removing, as well as rhn_help_link.
diff --git a/web/modules/sniglets/Sniglets/HTML.pm b/web/modules/sniglets/Sniglets/HTML.pm
index f7a4962..f99a031 100644
--- a/web/modules/sniglets/Sniglets/HTML.pm
+++ b/web/modules/sniglets/Sniglets/HTML.pm
@@ -29,7 +29,6 @@ sub register_tags {
my $pxt = shift;
$pxt->register_tag("rhn-help", \&rhn_help);
- $pxt->register_tag("rhn-help-link", \&rhn_help_link);
$pxt->register_tag("rhn-if-var", \&if_var, -5);
$pxt->register_tag("rhn-unless-var", \&unless_var, -5);
@@ -160,21 +159,6 @@ sub rhn_help {
-satellite => $params{satellite});
}
-sub rhn_help_link {
- my $pxt = shift;
- my %params = @_;
-
- my $block = $params{__block__};
- my $guide = $params{guide} || '';
- my $href = $params{href} || '';
-
- return render_help_link(-user => $pxt->user,
- -guide => $guide,
- -href => $href,
- -block => $block,
- -satellite => $params{satellite});
-}
-
sub render_help_link {
my %params = validate(@_, {-user => 1, -guide => 0, -href => 1, -block => 0, -satellite => 0});
my $user = $params{-user};
14 years, 5 months
reporting/spacewalk-reports.spec
by Jan Pazdziora
reporting/spacewalk-reports.spec | 1 +
1 file changed, 1 insertion(+)
New commits:
commit faa84e717dee597a47e09ea8af39394aeec7df15
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Dec 15 08:51:17 2009 +0100
Add defattr to spacewalk-reports.spec.
diff --git a/reporting/spacewalk-reports.spec b/reporting/spacewalk-reports.spec
index f3845c9..00740bb 100644
--- a/reporting/spacewalk-reports.spec
+++ b/reporting/spacewalk-reports.spec
@@ -35,6 +35,7 @@ install *.8 $RPM_BUILD_ROOT/%{_mandir}/man8
rm -rf $RPM_BUILD_ROOT
%files
+%defattr(-,root,root)
%attr(755,root,root) %{_bindir}/spacewalk-report
%{_prefix}/share/spacewalk/reports.py*
%{_prefix}/share/spacewalk/reports/data/*
14 years, 5 months
Changes to 'multi_user'
by Justin Sherrill
New branch 'multi_user' available with the following commits:
commit 21adf2ff66f303ce696ac12b154ca0786f5fb86d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 28 10:28:28 2009 -0400
fixing page size preference for new multi user
commit 82597936bbace05be854ff76f300e1fc1290c64f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 17 13:38:36 2009 -0400
some perl fixes for multiorg user
commit e58bad6c9784fe320f90f05404db6808a7f2daa9
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Tue Sep 15 11:56:59 2009 -0400
more multi user changes
commit b1b5fff546440f484bd9bc65ce30242b1007ff30
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 14 16:42:50 2009 -0400
backend fix
commit 08ac4952ccf333cbee4b028bacf9efdc92646b9e
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 14 15:35:41 2009 -0400
more backend changes
commit b504a781610434370ee8498446c9b492671546b3
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 14 15:13:19 2009 -0400
more backend fixes
commit 7f7d1cc2b4d43dcc76a121fd08d6ce35a6141f4f
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 14 15:07:54 2009 -0400
backend fix
commit f6b555fcffcd3165babf93e45df32efa8a05f8cb
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Mon Sep 14 15:04:35 2009 -0400
more multi user stuff
commit 4ed011ef0b511e8237ab4fbaf01cf49a79d96548
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Fri Sep 11 18:47:10 2009 -0400
massive commit for multi-user
commit c26e650b4383fd3b14840efc4c93f0f469ef8d95
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Wed Sep 9 20:16:02 2009 -0400
adding SwitchOrgsAction responsible for switching orgs
commit 4ff8ca2fdf5e40cb337205201dc722d01d309503
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 18:12:19 2009 -0400
more stuff for multiorg 3
commit fe812fa24755dcefdd7d435ee4e4037e71fc1adf
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 16:00:13 2009 -0400
adding schema upgrade script
commit 1824b8070d8bfe76609511db44e5607e0e2cadde
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 14:02:23 2009 -0400
new java stuff for new multiorg
commit d18a17dc619f73fe355b34774d54fd974068f52b
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 13:59:14 2009 -0400
another fix to rhnUser
commit 0266e7d67ec2f8fe592e0e12fac129ecdc2608e5
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 13:53:15 2009 -0400
another fix to rhnUser
commit 5ec1e5c373a5505d1c313fd814305e75c29953a2
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 13:46:57 2009 -0400
updating rhnUser for new multiorg again
commit 978de7d1db1a8de5963cb58ea7935c3449b2ece7
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 13:38:26 2009 -0400
updating rhnUser for new multiorg
commit 7a52a92ca255c6cd3e15c7158f0cbc24b074b08d
Author: Justin Sherrill <jsherril(a)redhat.com>
Date: Thu Sep 3 10:05:51 2009 -0400
updating rhnUser for new user schema
14 years, 5 months
Changes to 'refs/tags/rhn-client-tools-0.8.1-1'
by Miroslav Suchý
Tag 'rhn-client-tools-0.8.1-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2009-12-14 16:13 +0000
Tagging package [rhn-client-tools] version [0.8.1-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-backend-0.8.11-1:
Milan Zazrivec (1):
503146 - use stdout whether it's an actual tty or not
Miroslav Suchý (4):
546312 - reverting revision 186347
no need to call hal on non-intel machine when the information is not used
546312 - use dmidecode instead of hal
Automatic commit of package [rhn-client-tools] release [0.8.1-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 7
client/rhel/rhn-client-tools/src/up2date_client/hardware.py | 97 +++++-----
client/rhel/rhn-client-tools/src/up2date_client/rhnreg.py | 48 ----
client/rhel/rhn-client-tools/src/up2date_client/up2dateLog.py | 2
rel-eng/packages/rhn-client-tools | 2
5 files changed, 75 insertions(+), 81 deletions(-)
---
14 years, 5 months