spacewalk-commits
December 2009
spacewalk-commits@lists.fedorahosted.org
- 6 participants
- 223 discussions
web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Channel.pm | 26 --------------------------
1 file changed, 26 deletions(-)
New commits:
commit 48fdbd6befc09a679157958f4171a22d0b27bc35
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:33:52 2009 +0100
Removal of get_channel_family_map made family_details_from_set unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index d8c4fd0..caccfda 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1311,32 +1311,6 @@ EOQ
-sub family_details_from_set {
- my $class = shift;
- my $uid = shift;
- my $set_label = shift;
-
- die "No uid" unless defined $uid;
- die "No set label" unless defined $set_label;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT CF.id, CF.name, CF.label, CF.product_url, CF.org_id, RS.element_two
- FROM rhnChannelFamily CF,
- rhnSet RS
-WHERE CF.id=RS.element and RS.user_id = :user_id AND RS.label=:label
-EOQ
-
- $sth->execute_h(user_id=> $uid, label => $set_label);
-
- my @ret;
- while (my $row = $sth->fetchrow_hashref) {
- push @ret, $row;
- }
-
- return @ret;
-}
-
sub packages {
my $self = shift;
my $cid;
14 years, 4 months
- 1
- 0
15 commits - web/modules web/spacewalk-web.spec
by Jan Pazdziora
web/modules/rhn/RHN/CommandParameter.pm | 46 -
web/modules/rhn/RHN/DB/Command.pm | 19
web/modules/rhn/RHN/DB/CommandParameter.pm | 142 ---
web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml | 12
web/modules/rhn/RHN/DB/Probe.pm | 60 -
web/modules/rhn/RHN/DB/ProbeParam.pm | 146 ---
web/modules/rhn/RHN/DB/Server.pm | 26
web/modules/rhn/RHN/ProbeParam.pm | 47 -
web/modules/sniglets/Sniglets/Org.pm | 67 -
web/modules/sniglets/Sniglets/Probes.pm | 684 ----------------
web/spacewalk-web.spec | 6
11 files changed, 1255 deletions(-)
New commits:
commit b089ca8966a3970547b7d3f09afd4188ed140b46
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:31:52 2009 +0100
Previous removals made get_channel_family_map unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 0951bd8..2d1cd48 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -43,20 +43,4 @@ sub reset_and_commit_set {
$set->commit();
}
-sub get_channel_family_map {
- my $uid = shift;
- my $set_label = shift;
-
- my @data = RHN::Channel->family_details_from_set($uid, $set_label);
-
- my $ret;
- foreach my $row (@data) {
- my $label = $row->{LABEL};
- $ret->{$label}->{QUANT} = $row->{ELEMENT_TWO};
- $ret->{$label}->{ID} = $row->{ID};
- }
-
- return $ret;
-}
-
1;
commit 4931c2e85d6bdd9697c7bd501c98b6d46608c60d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:31:15 2009 +0100
Removal of get_service_map made server_group_type_details_from_set unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index ac0d273..94fff25 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -3652,32 +3652,6 @@ EOQ
return $row;
}
-sub server_group_type_details_from_set {
- my $class = shift;
- my $uid = shift;
- my $set_label = shift;
-
- die "No uid" unless defined $uid;
- die "No set label" unless defined $set_label;
-
- my $dbh = RHN::DB->connect;
- my $sth = $dbh->prepare(<<EOQ);
-SELECT SGT.id, SGT.label, RS.element_two
- FROM rhnServerGroupType SGT,
- rhnSet RS
-WHERE SGT.id=RS.element and RS.user_id = :user_id AND RS.label=:label
-EOQ
-
- $sth->execute_h(user_id=> $uid, label => $set_label);
-
- my @ret;
- while (my $row = $sth->fetchrow_hashref) {
- push @ret, $row;
- }
-
- return @ret;
-}
-
# Make a guess at this system's hostname
sub guess_hostname {
my $self = shift;
commit 19fc4f01d121eff8a594986407b351a3c518ee4c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:30:41 2009 +0100
Previous removals made get_service_map unused, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index a7cbe76..0951bd8 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -59,20 +59,4 @@ sub get_channel_family_map {
return $ret;
}
-sub get_service_map {
- my $uid = shift;
-
- my @data = RHN::Server->server_group_type_details_from_set($uid, 'new_cert_service_set');
-
- my $ret;
- foreach my $row (@data) {
- my $label = $row->{LABEL};
- $ret->{$label}->{QUANT} = $row->{ELEMENT_TWO};
- $ret->{$label}->{ID} = $row->{ID};
- }
-
- return $ret;
-}
-
-
1;
commit 857a5f2bcb008db3c09f7732e4aae7e3ba9312c9
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:28:55 2009 +0100
register_tags without content can be removed as well.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index f261116..a7cbe76 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -25,12 +25,6 @@ use Carp;
use RHN::Exception qw/throw/;
-sub register_tags {
- my $class = shift;
- my $pxt = shift;
-
-}
-
sub reset_form {
my $pxt = shift;
commit 172bab0fb7408e422e8122b8899f02ddbe6a2736
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:28:27 2009 +0100
rhn:cert_text_cb not used, removing, as well as cert_text_cb.
diff --git a/web/modules/sniglets/Sniglets/Org.pm b/web/modules/sniglets/Sniglets/Org.pm
index 98bffa0..f261116 100644
--- a/web/modules/sniglets/Sniglets/Org.pm
+++ b/web/modules/sniglets/Sniglets/Org.pm
@@ -31,14 +31,6 @@ sub register_tags {
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:cert_text_cb' => \&cert_text_cb);
-
-}
-
sub reset_form {
my $pxt = shift;
@@ -89,25 +81,4 @@ sub get_service_map {
}
-sub cert_text_cb {
- my $pxt = shift;
-
- my $support_org_id = $pxt->param('support_org_id');
- my $action = $pxt->dirty_param('button');
-
- my $data = $pxt->session->get('new_cert_info');
- my %cert_info;
- if ($data and $data->{'meta_info'}->{'support_org_id'} eq $support_org_id) {
- %cert_info = %{$data};
- }
- else {
- reset_form($pxt);
- croak "No cert data!";
- }
-
- if ($action eq "Back") {
- $pxt->redirect("/internal/support/create_cert.pxt?support_org_id=" . $support_org_id);
- }
-}
-
1;
commit a76f4f8749d7a025f179932cfeb340fcc225ae13
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:27:21 2009 +0100
Previous removals made RHN::ProbeParam and RHN::DB::ProbeParam not needed, removing as dead packages.
diff --git a/web/modules/rhn/RHN/DB/ProbeParam.pm b/web/modules/rhn/RHN/DB/ProbeParam.pm
deleted file mode 100644
index 33762ae..0000000
--- a/web/modules/rhn/RHN/DB/ProbeParam.pm
+++ /dev/null
@@ -1,89 +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::DB::ProbeParam;
-
-use Params::Validate qw/:all/;
-Params::Validate::validation_options(strip_leading => '-');
-
-use strict;
-use Carp;
-use Data::Dumper;
-use RHN::DataSource::Simple;
-
-our $VERSION = (split(/s+/, q$Id$, 4))[2];
-
-#########
-sub new {
-#########
- my $class = shift;
- my %args = @_;
- my $self = {};
- bless($self, $class);
-
- foreach my $arg (keys %args) {
- $self->$arg($args{$arg});
- }
-
- return $self;
-}
-
-
-############
-sub create {
-############
- my $class = shift;
- my $self = bless { }, $class;
- return $self;
-}
-
-
-1;
-
-__END__
-=head1 NAME
-
-RHN::DB::ProbeParam - Monitoring probe parameters
-
-=head1 SYNOPSIS
-
- use RHN::DB::ProbeParam;
-
-=head1 DESCRIPTION
-
-RHN::DB::ProbeParam provides access to monitoring probe parameters
-(the RHN_PROBE_PARAMS table);
-
-=head1 CLASS METHODS
-
-=over 8
-
-=item new()
-
-Creates a new RHN::DB::ProbeParam object
-
-=back
-
-=head1 SEE ALSO
-
-L<RHN::DB::Probe>, L<RHN::DB::Command>
-
-=head1 COPYRIGHT
-
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
-
-=cut
-
-
diff --git a/web/modules/rhn/RHN/ProbeParam.pm b/web/modules/rhn/RHN/ProbeParam.pm
deleted file mode 100644
index 2825b29..0000000
--- a/web/modules/rhn/RHN/ProbeParam.pm
+++ /dev/null
@@ -1,47 +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::ProbeParam;
-
-use strict;
-use RHN::DB::Probe;
-use RHN::DB::ProbeParam;
-
-our @ISA = qw(RHN::DB::ProbeParam);
-our $VERSION = (split(/s+/, q$Id$, 4))[2];
-
-
-1;
-
-__END__
-=head1 NAME
-
-RHN::Probe - Wrapper class for RHN::DB::ProbeParam
-
-=head1 DESCRIPTION
-
-Wrapper class for RHN::DB::ProbeParam
-
-=head1 SEE ALSO
-
-L<RHN::DB::Probe>
-
-=head1 COPYRIGHT
-
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
-
-=cut
-
-
diff --git a/web/modules/sniglets/Sniglets/Probes.pm b/web/modules/sniglets/Sniglets/Probes.pm
index 160080e..f862215 100644
--- a/web/modules/sniglets/Sniglets/Probes.pm
+++ b/web/modules/sniglets/Sniglets/Probes.pm
@@ -24,7 +24,6 @@ use RHN::ContactGroup;
use RHN::DataSource;
use RHN::Exception;
use RHN::Probe;
-use RHN::ProbeParam;
use RHN::Server;
use RHN::Form::Widget::Checkbox;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 380f9f5..be145c2 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -194,7 +194,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/Package/
%{perl_vendorlib}/RHN/Postal.pm
%{perl_vendorlib}/RHN/Probe.pm
-%{perl_vendorlib}/RHN/ProbeParam.pm
%{perl_vendorlib}/RHN/Product.pm
%{perl_vendorlib}/RHN/Profile.pm
%{perl_vendorlib}/RHN/ProxyInstall.pm
@@ -235,13 +234,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/RHN::DB::ContactMethod.3pm.gz
%{_mandir}/man3/RHN::DB::MonitoringConfigMacro.3pm.gz
%{_mandir}/man3/RHN::DB::Probe.3pm.gz
-%{_mandir}/man3/RHN::DB::ProbeParam.3pm.gz
%{_mandir}/man3/RHN::DB::SatCluster.3pm.gz
%{_mandir}/man3/RHN::DB::SatNode.3pm.gz
%{_mandir}/man3/RHN::DB::ServerGroup.3pm.gz
%{_mandir}/man3/RHN::MonitoringConfigMacro.3pm.gz
%{_mandir}/man3/RHN::Probe.3pm.gz
-%{_mandir}/man3/RHN::ProbeParam.3pm.gz
%{_mandir}/man3/RHN::SCDB.3pm.gz
%{_mandir}/man3/RHN::SatCluster.3pm.gz
%{_mandir}/man3/RHN::SatNode.3pm.gz
commit 8e178239ac3efedf0c36346e4d21cf54dc5a35b2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:25:18 2009 +0100
Removal of build_system_probe_edit_form and system_probe_edit_cb made list_probe_param_values unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/ProbeParam.pm b/web/modules/rhn/RHN/DB/ProbeParam.pm
index 93022fa..33762ae 100644
--- a/web/modules/rhn/RHN/DB/ProbeParam.pm
+++ b/web/modules/rhn/RHN/DB/ProbeParam.pm
@@ -49,19 +49,6 @@ sub create {
return $self;
}
-#############################
-sub list_probe_param_values {
-#############################
- my $class = shift;
- my $probe_id = shift;
- my $command_id = shift;
-
- my $ds = new RHN::DataSource::Simple(-querybase => "probe_queries",
- -mode => "params_for_probe");
-
- return $ds->execute_query(-probe_id => $probe_id, -command_id => $command_id);
-}
-
1;
@@ -74,9 +61,6 @@ RHN::DB::ProbeParam - Monitoring probe parameters
use RHN::DB::ProbeParam;
- # Get a list of probe parameters
- my $params = RHN::DB::ProbeParam->list_probe_param_values($pid, $cid);
-
=head1 DESCRIPTION
RHN::DB::ProbeParam provides access to monitoring probe parameters
@@ -90,10 +74,6 @@ RHN::DB::ProbeParam provides access to monitoring probe parameters
Creates a new RHN::DB::ProbeParam object
-=item I<list_probe_param_values>($probe_id, $command_id)
-
-Lists probe param values given a probe ID and a command ID.
-
=back
=head1 SEE ALSO
commit 0190662feeb36844ef5acb9f9d718687d12df512
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:22:02 2009 +0100
Removal of rhn:system_probe_*cb made update_probe_param_values unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/ProbeParam.pm b/web/modules/rhn/RHN/DB/ProbeParam.pm
index 0a177eb..93022fa 100644
--- a/web/modules/rhn/RHN/DB/ProbeParam.pm
+++ b/web/modules/rhn/RHN/DB/ProbeParam.pm
@@ -63,32 +63,6 @@ sub list_probe_param_values {
}
-###############################
-sub update_probe_param_values {
-###############################
- my $class = shift;
- my $probe_id = shift;
- my %modified_params = @_;
-
- my $dbh = RHN::DB->connect;
- my $sqlstmt;
- my $sth;
-
- my ($name, $value);
- while ( ($name, $value) = each %modified_params) {
- $sqlstmt = <<EOQ;
-UPDATE PROBE_PARAM_VALUE
- SET value = :value,
- last_update_date = SYSDATE
- WHERE param_name = :param_name
- AND probe_id = :probe_id
-EOQ
- $sth = $dbh->prepare($sqlstmt);
- $sth->execute_h(value => $value, param_name => $name, probe_id => $probe_id);
- }
-
-}
-
1;
__END__
@@ -103,13 +77,6 @@ RHN::DB::ProbeParam - Monitoring probe parameters
# Get a list of probe parameters
my $params = RHN::DB::ProbeParam->list_probe_param_values($pid, $cid);
- # Update changed parameters
- RHN::DB::ProbeParam->update_probe_param_values($pid,
- $paramname => $value,
- # ...
- );
-
-
=head1 DESCRIPTION
RHN::DB::ProbeParam provides access to monitoring probe parameters
@@ -127,10 +94,6 @@ Creates a new RHN::DB::ProbeParam object
Lists probe param values given a probe ID and a command ID.
-=item I<update_probe_param_values>($probe_id, %modified_params)
-
-Updates a list of modified parameters given a probe ID.
-
=back
=head1 SEE ALSO
commit 437581dde5c60ab46a5889c7f2bde0637c8cab8d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:20:28 2009 +0100
Removal of rhn:system_probe_*cb made insert_check_probe and insert_probe_params unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Probe.pm b/web/modules/rhn/RHN/DB/Probe.pm
index c1ef038..1609666 100644
--- a/web/modules/rhn/RHN/DB/Probe.pm
+++ b/web/modules/rhn/RHN/DB/Probe.pm
@@ -283,66 +283,6 @@ sub commit {
delete $self->{":modified:"};
}
-########################
-sub insert_check_probe {
-########################
- my $self = shift;
-
- my ($probe_id, $host_id, $sat_cluster_id);
-
- $probe_id = $self->{__recid__};
- $host_id = $self->{__host_id__};
- $sat_cluster_id = $self->{__sat_cluster_id__};
-
- my $dbh = RHN::DB->connect;
-
- #probe_type will always be 'check'
- my $query = <<EOS;
-INSERT INTO rhn_check_probe
- (probe_id, host_id, probe_type, sat_cluster_id)
-VALUES
- (:probe_id, :host_id, 'check', :sat_cluster_id)
-EOS
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(probe_id => $probe_id, host_id => $host_id, sat_cluster_id => $sat_cluster_id);
- $dbh->commit;
-
-}
-
-#########################
-sub insert_probe_params {
-#########################
- my $class = shift;
- my %params = @_;
-
- my $dbh = RHN::DB->connect;
- my ($sth, $query);
- my ($param_name, $value);
- my $probe_id = $class->{__recid__};
- my $command_id = $class->{__command_id__};
- my $last_update_user = $class->{__last_update_user__};
-
- foreach my $key (sort keys %params) {
- $param_name = $key;
- $value = $params{$key};
-
- $query = <<EOQ;
-INSERT INTO rhn_probe_param_value
- (probe_id, command_id, param_name, value, last_update_user, last_update_date)
-VALUES
- (:probe_id, :command_id, :param_name, :value, :last_update_user, sysdate)
-EOQ
-
- $sth = $dbh->prepare($query);
- $sth->execute_h(probe_id => $probe_id, command_id => $command_id, param_name => $param_name,
- value => $value, last_update_user => $last_update_user);
- }
-
- $dbh->commit;
-
-}
-
#################
sub list_scouts {
#################
commit 9f38aba1c254ab73be64ed26debc7b9b81465091
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:18:44 2009 +0100
Removal of list_by_command made RHN::DB::CommandParameter and RHN::CommandParameter empty, removing as dead packages.
diff --git a/web/modules/rhn/RHN/CommandParameter.pm b/web/modules/rhn/RHN/CommandParameter.pm
deleted file mode 100644
index 8d75009..0000000
--- a/web/modules/rhn/RHN/CommandParameter.pm
+++ /dev/null
@@ -1,46 +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::CommandParameter;
-
-use strict;
-use RHN::DB::CommandParameter;
-
-our @ISA = qw(RHN::DB::CommandParameter);
-our $VERSION = (split(/s+/, q$Id$, 4))[2];
-
-
-1;
-
-__END__
-=head1 NAME
-
-RHN::CommandParameter - Wrapper class for RHN::DB::CommandParameter
-
-=head1 DESCRIPTION
-
-Wrapper class for RHN::DB::CommandParameter
-
-=head1 SEE ALSO
-
-L<RHN::DB::CommandParameter>
-
-=head1 COPYRIGHT
-
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
-
-=cut
-
-
diff --git a/web/modules/rhn/RHN/DB/CommandParameter.pm b/web/modules/rhn/RHN/DB/CommandParameter.pm
deleted file mode 100644
index 73f82f1..0000000
--- a/web/modules/rhn/RHN/DB/CommandParameter.pm
+++ /dev/null
@@ -1,113 +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::DB::CommandParameter;
-
-use strict;
-use Carp;
-use RHN::DataSource::Simple;
-
-
-our $VERSION = (split(/s+/, q$Id$, 4))[2];
-
-# Hash of default values for instance construction
-use constant INSTANCE_DEFAULTS => (
-);
-
-
-
-
-# Generated getter/setter methods (per Chip)
-{
-
- my @fields = qw(
- command_id param_name param_type data_type_name description mandatory
- default_value min_value max_value field_order field_widget_name
- field_visible_length field_maximum_length field_visible
- default_value_visible
- );
-
- my $tmpl = q|
- sub [[field]] {
- my $self = shift;
- if (@_) {
- $self->{__[[field]]__} = shift;
- }
- return $self->{__[[field]]__};
- };
- |;
-
- foreach my $field (@fields) {
-
- (my $sub = $tmpl) =~ s/\[\[field\]\]/$field/g;
-
- eval $sub;
-
- croak $@ if($@);
- }
-
-}
-
-
-#########
-sub new {
-#########
- my $class = shift;
- my %args = @_;
- my $self = {};
- bless($self, $class);
-
- foreach my $arg (keys %args) {
- $self->$arg($args{$arg});
- }
-
- # Set defaults for values that weren't supplied to the constructor
- my %defaults = (INSTANCE_DEFAULTS);
- foreach my $field (keys %defaults) {
- $self->$field($defaults{$field}) unless(defined($self->$field()));
- }
-
- return $self;
-}
-
-
-
-1;
-
-__END__
-=head1 NAME
-
-RHN::DB::CommandParameter - Monitoring command parameters
-
-=head1 SYNOPSIS
-
- use RHN::DB::CommandParameter;
-
-=head1 DESCRIPTION
-
-RHN::DB::CommandParamter provides access to monitoring command
-parameters (RHN_COMMAND_PARAMETER table).
-
-=head1 SEE ALSO
-
-L<RHN::DB::Command>
-
-=head1 COPYRIGHT
-
-Copyright (c) 2004-2005, Red Hat, Inc. All rights reserved
-
-=cut
-
-
diff --git a/web/modules/sniglets/Sniglets/Probes.pm b/web/modules/sniglets/Sniglets/Probes.pm
index 803f771..160080e 100644
--- a/web/modules/sniglets/Sniglets/Probes.pm
+++ b/web/modules/sniglets/Sniglets/Probes.pm
@@ -20,7 +20,6 @@ package Sniglets::Probes;
use Data::Dumper;
use RHN::Command;
-use RHN::CommandParameter;
use RHN::ContactGroup;
use RHN::DataSource;
use RHN::Exception;
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 409fa4f..380f9f5 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -161,7 +161,6 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/ChannelEditor.pm
%{perl_vendorlib}/RHN/Cleansers.pm
%{perl_vendorlib}/RHN/Command.pm
-%{perl_vendorlib}/RHN/CommandParameter.pm
%{perl_vendorlib}/RHN/ConfigChannel.pm
%{perl_vendorlib}/RHN/ConfigFile.pm
%{perl_vendorlib}/RHN/ConfigRevision.pm
@@ -229,11 +228,9 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorlib}/RHN/UserGroup.pm
%{perl_vendorlib}/RHN/Utils.pm
%{_mandir}/man3/RHN::Command.3pm.gz
-%{_mandir}/man3/RHN::CommandParameter.3pm.gz
%{_mandir}/man3/RHN::ContactGroup.3pm.gz
%{_mandir}/man3/RHN::ContactMethod.3pm.gz
%{_mandir}/man3/RHN::DB::Command.3pm.gz
-%{_mandir}/man3/RHN::DB::CommandParameter.3pm.gz
%{_mandir}/man3/RHN::DB::ContactGroup.3pm.gz
%{_mandir}/man3/RHN::DB::ContactMethod.3pm.gz
%{_mandir}/man3/RHN::DB::MonitoringConfigMacro.3pm.gz
commit dbc1c834a56029cc702b9868c05a1c66e276b32d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:15:00 2009 +0100
Removal of rhn:system_probe_*cb made list_by_command unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/CommandParameter.pm b/web/modules/rhn/RHN/DB/CommandParameter.pm
index 9aaba0b..73f82f1 100644
--- a/web/modules/rhn/RHN/DB/CommandParameter.pm
+++ b/web/modules/rhn/RHN/DB/CommandParameter.pm
@@ -84,23 +84,6 @@ sub new {
-# List parameters by command ID
-#####################
-sub list_by_command {
-#####################
- my $class = shift;
- my $command_id = shift;
-
- my $ds = new RHN::DataSource::Simple(-querybase => "probe_queries",
- -mode => "parameters_for_command");
-
- return $ds->execute_query(-command_id => $command_id);
-
-}
-
-
-
-
1;
__END__
@@ -112,23 +95,11 @@ RHN::DB::CommandParameter - Monitoring command parameters
use RHN::DB::CommandParameter;
- my $plist = RHN::DB::CommandParameter->list_by_command($command_id);
-
=head1 DESCRIPTION
RHN::DB::CommandParamter provides access to monitoring command
parameters (RHN_COMMAND_PARAMETER table).
-=head1 CLASS METHODS
-
-=over 8
-
-=item list_by_command($command_id)
-
-List parameters by command ID. Returns a list of hashes.
-
-=back
-
=head1 SEE ALSO
L<RHN::DB::Command>
commit 517a890782abf2aee53af2464d499eb75ff507ed
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:08:31 2009 +0100
Removal of list_commands_by_group made enabled_commands_for_group unused, removing as dead query.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
index 68b9812..c004d7f 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
@@ -43,18 +43,6 @@ ORDER BY UPPER(GROUP_NAME)
</mode>
-<mode name="enabled_commands_for_group">
- <query params="command_group_label">
-SELECT recid AS ID,
- description AS COMMAND_NAME,
- name AS COMMAND_LABEL
- FROM rhn_command
- WHERE group_name = :command_group_label
- AND enabled = 1
-ORDER BY UPPER(description)
- </query>
-</mode>
-
<mode name="parameters_for_command">
<query params="command_id">
SELECT command_id,
commit fb244b6197fd666cf173a3692f3cf41886317bed
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:07:42 2009 +0100
Removal of rhn:system_probe_*cb made list_commands_by_group unused, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/Command.pm b/web/modules/rhn/RHN/DB/Command.pm
index 36248cf..19efd35 100644
--- a/web/modules/rhn/RHN/DB/Command.pm
+++ b/web/modules/rhn/RHN/DB/Command.pm
@@ -150,20 +150,6 @@ sub lookup {
}
-# Get a list of enabled commands given a command group name
-############################
-sub list_commands_by_group {
-############################
- my $class = shift;
- my $command_group_label = shift;
-
- my $ds = new RHN::DataSource::Simple(-querybase => "probe_queries",
- -mode => "enabled_commands_for_group");
-
- return $ds->execute_query(-command_group_label => $command_group_label);
-}
-
-
# Get a list of available command groups
#################
sub list_groups {
@@ -191,7 +177,6 @@ RHN::DB::Command - Monitoring commands
use RHN::DB::Command;
my $groups = RHN::DB::Command->list_groups();
- my $commands = RHN::DB::Command->list_commands_by_group($group_name);
my $cmd_obj = RHN::DB::Command->lookup(id => $command_id);
@@ -212,10 +197,6 @@ Construct a new RHN::DB::Command object.
Get a list of available command groups.
-=item list_commands_by_group($group_name)
-
-Get a list of enabled commands given a command group name.
-
=item lookup(id => $command_id)
Look up command by ID. Returns an RHN::DB::Command object.
commit 8efdb4a4c12351ac6a6220ce689d99021842410f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 20:06:04 2009 +0100
rhn:system_probe_creation_cb and rhn:system_probe_edit_cb not used, removing, as well as other dependant functions.
diff --git a/web/modules/sniglets/Sniglets/Probes.pm b/web/modules/sniglets/Sniglets/Probes.pm
index 51925ff..803f771 100644
--- a/web/modules/sniglets/Sniglets/Probes.pm
+++ b/web/modules/sniglets/Sniglets/Probes.pm
@@ -49,662 +49,6 @@ sub register_tags {
$pxt->register_tag("rhn-probe-state-summary", \&probe_state_summary);
}
-sub register_callbacks {
- my $class = shift;
- my $pxt = shift;
-
- $pxt->register_callback('rhn:system_probe_creation_cb' => \&system_probe_creation_cb);
- $pxt->register_callback('rhn:system_probe_edit_cb' => \&system_probe_edit_cb);
-}
-
-######################################
-sub build_system_probe_creation_form {
-######################################
- my $pxt = shift;
- my %params = @_;
-
- my $finished;
- my $probe_command_id;
-
- my $sid = $pxt->param('sid');
- throw "no sid" unless $sid;
-
- my $probe_command_group = $pxt->dirty_param('probe_command_group') || 'linux';
-
- my $form = new RHN::Form::ParsedForm(name => 'System Probe',
- label => 'system_probe',
- action => $params{action},
- );
-
- my $command_groups = RHN::Command->list_groups();
- my @group_options = map { { value => $_->{COMMAND_GROUP_NAME}, label => $_->{COMMAND_GROUP_LABEL} } } @{$command_groups};
- throw "no command groups!" unless @group_options;
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Probe Command Group',
- label => 'probe_command_group',
- size => 1,
- value => $probe_command_group ? $probe_command_group : 'tools',
- options => [ @group_options ],
- auto_submit => 1,
- requires => {response => 1}) );
-
- my $group_commands;
-
- if ($probe_command_group eq 'all') {
- my @commands = ();
-
- for my $group_label (map { $_->{COMMAND_GROUP_NAME} } @{$command_groups}) {
-
- my $tmp_commands = RHN::Command->list_commands_by_group($group_label);
- push @commands, (@{$tmp_commands});
- }
-
- # sort per bugzilla 107149
- @commands = sort { $a->{COMMAND_NAME} cmp $b->{COMMAND_NAME} } @commands;
-
- $group_commands = \@commands;
- }
- else {
- $group_commands = RHN::Command->list_commands_by_group($probe_command_group);
- }
-
- my @command_options = map {{ value => $_->{ID},
- label => $_->{COMMAND_NAME} }} @{$group_commands};
- throw "no group commands!" unless @command_options;
-
-
- if ($pxt->dirty_param('probe_command_id')) {
- ($probe_command_id) = grep { $_ eq $pxt->dirty_param('probe_command_id') } map { $_->{ID} } @{$group_commands};
- }
-
- if (not $probe_command_id) {
- $probe_command_id = $command_options[0]->{value};
- }
-
- my $command_obj = RHN::Command->lookup(id => $probe_command_id);
-
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Probe Command',
- label => 'probe_command_id',
- size => 1,
- value => $command_options[0]->{value},
- options => [ @command_options ],
- auto_submit => 1,
- requires => {response => 1}));
-
- #use the sat_clusters defined for the users org in the select box
- my @scout_options = $pxt->user->org->get_scout_options();
- if (not @scout_options) {
- $pxt->push_message(local_alert => "No monitoring scouts defined for your organization.");
- }
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Monitoring Scout',
- label => 'scout_id',
- size => 1,
- value => $scout_options[0]->{label},
- options => [ @scout_options ],
- requires => {response => 1}));
-
- if ($command_obj->requirements_description()) {
- $form->add_widget(new RHN::Form::Widget::Literal(name => 'Probe Requirements',
- value => $command_obj->requirements_description()));
- }
-
- if ($command_obj->version_support()) {
- $form->add_widget(new RHN::Form::Widget::Literal(name => 'Supported Versions',
- value => $command_obj->version_support()));
- }
-
- #need to figure out how to change default description when a new command_group or command is selected
- # my $default_desc = $command_obj->command_class();
-
- $form->add_widget(new RHN::Form::Widget::Text(name => 'Probe Description',
- label => 'probe_description',
- size => 50,
-# value => $default_desc,
- maxlength => 100,
- requires => {response => 1}));
-
-
- # pxt_passthrough doesn't really know how to set "checked" so we have to keep track
- # ourselves.
- my $probe_notifications = $pxt->dirty_param('probe_notifications') || 0;
- $form->add_widget(new RHN::Form::Widget::Checkbox(name => 'Probe Notifications',
- label => 'probe_notifications',
- auto_submit => 1,
- value => 1,
- checked => $probe_notifications ));
-
- my @intervals = ( { value => '1', label => '1 minute' },
- { value => '5', label => '5 minutes' },
- { value => '10', label => '10 minutes' },
- { value => '15', label => '15 minutes' },
- { value => '30', label => '30 minutes' },
- { value => '45', label => '45 minutes' },
- { value => '60', label => '1 hour' },
- { value => '120', label => '2 hours' },
- { value => '360', label => '6 hours' },
- { value => '720', label => '12 hours' },
- { value => '1440', label => '24 hours' }
- );
-
- if ($probe_notifications) {
-
- # We're taking advantage of the fact that we've kept the name of the contact group and the
- # one member contact method in sync to present the contact group name which the user will
- # assume is the contact method.
- my $contact_groups = RHN::ContactGroup->list_groups($pxt->user, $sid);
- my @contact_group_options = map {{ value => $_->{ID},
- label => $_->{CONTACT_GROUP_NAME} }} @{$contact_groups};
-
- if (not @contact_group_options) {
- # setting the param to 0 effectively unchecks the checkbox. So here we uncheck the
- # checkbox and issue a message indicating that theres nothing to select.
- $pxt->dirty_param('probe_notifications', 0);
- $pxt->push_message(local_alert => "No notification methods have been defined.");
- }
- else {
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Notification Interval',
- label => 'probe_notification_interval_min',
- size => 1,
- value => '5',
- options => [ @intervals ],
- requires => {response => 1}));
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Notification Method',
- label => 'cgid',
- size => 1,
- value => $contact_group_options[0]->{value},
- options => [ @contact_group_options ],
- requires => {response => 1}));
- }
- }
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Probe Check Interval',
- label => 'probe_check_interval_min',
- size => 1,
- value => '5',
- options => [ @intervals ],
- requires => {response => 1}));
-
-
-
- my $command_params = RHN::CommandParameter->list_by_command($probe_command_id);
-
- # add the command_id to the prefix so that the param names will be unique
- # across the auto_submits
- my $formvar_prefix = $probe_command_id .'_param_';
-
- # XXX FIXME: this is probably woefully incomplete...
- my %validation_methods = ( float => [regexp => '^(\d+(\.(\d)+)?)?$'],
- integer => [numeric => 1],
- probestate => [regexp => '(OK|WARNING|CRITICAL|UNKNOWN)'],
- );
-
- foreach my $param (@{$command_params}) {
- if ($param->{FIELD_VISIBLE}) {
-
- my $param_value = $pxt->dirty_param($param->{PARAM_NAME}) || $param->{DEFAULT_VALUE};
-
- my $field_type = $param->{FIELD_WIDGET_NAME};
-
- if ($field_type eq 'text') {
- my $data_type = $param->{DATA_TYPE_NAME};
- my @extra_requirements = exists $validation_methods{$data_type} ? @{$validation_methods{$data_type}} : ();
-
- my $mandatory = $param->{MANDATORY} ? 1 : 0;
- my $requires = { ($mandatory ? (response => 1) : ()), @extra_requirements};
-
- if ($data_type eq 'password') {
- $form->add_widget(new RHN::Form::Widget::Password(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- default => $param_value,
- size => $param->{FIELD_VISIBLE_LENGTH},
- maxlength => $param->{FIELD_MAXIMUM_LENGTH},
- requires => $requires
- ));
- }
- else {
- $form->add_widget(new RHN::Form::Widget::Text(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- size => $param->{FIELD_VISIBLE_LENGTH},
- maxlength => $param->{FIELD_MAXIMUM_LENGTH},
- #default => $param->{DEFAULT_VALUE},
- value => $param_value,
- requires => $requires
- ));
- }
- }
- elsif ($field_type eq 'checkbox') {
- $form->add_widget(new RHN::Form::Widget::Checkbox(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- value => 1,
- checked => $param_value));
- }
- else {
- throw 'unknown widget type';
- }
- }
- else {
- # if we got here, that means that the param is nonvisible tot he user, and we should just use the default value for it
- $form->add_widget(new RHN::Form::Widget::Hidden(name => $formvar_prefix . $param->{PARAM_NAME},
- value => $param->{DEFAULT_VALUE}
- ));
- }
- }
-
- $form->add_widget(new RHN::Form::Widget::Submit(name => 'Create Probe'));
- $form->add_widget(new RHN::Form::Widget::Hidden(name => 'sid', value => $sid));
-
- $form->add_widget(new RHN::Form::Widget::Hidden(name => 'pxt:trap', value => 'rhn:system_probe_creation_cb'));
-
- return $form;
-}
-
-##############################
-sub system_probe_creation_cb {
-##############################
- my $pxt = shift;
-
- unless ($pxt->dirty_param('Create Probe')) {
- # don't do any creation stuff unless they actually hit the create button
- return;
- }
-
- my $form = build_system_probe_creation_form($pxt);
- my $response = $form->prepare_response;
-
- my $errors = Sniglets::Forms::load_params($pxt, $response);
-
- if (@{$errors}) {
- foreach my $error (@{$errors}) {
- $pxt->push_message(local_alert => $error);
- }
- return;
- }
-
- my $sid = $pxt->param('sid');
- throw "no sid" unless $sid;
-
- my $command_id = $pxt->dirty_param('probe_command_id');
- throw "no command id" unless $command_id;
-
- my $probe_description = $pxt->dirty_param('probe_description');
- throw "no probe description" unless $probe_description;
-
- #set probe_notifications to 0 if the param is undef
- my $probe_notifications = $pxt->dirty_param('probe_notifications') || 0;
-
- my $probe_check_interval_min = $pxt->dirty_param('probe_check_interval_min');
-
- #use a default setting of 5min for notif interval for probes that won't notify,
- #as this field is a NOT NULL
- my $probe_notification_interval_min = $pxt->dirty_param('probe_notification_interval_min') || 5;
-
- my $contact_group_id = $pxt->param('cgid');
-
- my @param_formvars = grep { m/param_/ } $pxt->param();
- my %probe_params;
-
- # now strip off the formvar_prefix we added to the parameters
- for my $param_formvar (@param_formvars) {
- my $param_name = $param_formvar;
- $param_name =~ s/^\Q${command_id}_param_//;
-
- $probe_params{$param_name} = $pxt->dirty_param($param_formvar);
- }
-
- my $scout_id = $pxt->param('scout_id');
-
- my $probe = RHN::Probe->create;
-
- #set all the needed fields for the new probe object
- $probe->probe_type('check');
- $probe->max_attempts('1');
- $probe->command_id($command_id);
- $probe->description($probe_description);
- $probe->notify_critical($probe_notifications);
- $probe->notify_warning($probe_notifications);
- $probe->notify_unknown($probe_notifications);
- $probe->notify_recovery($probe_notifications);
- $probe->check_interval_minutes($probe_check_interval_min);
- $probe->notification_interval_minutes($probe_notification_interval_min);
- $probe->retry_interval_minutes($probe_check_interval_min);
- $probe->host_id($sid);
- $probe->sat_cluster_id($scout_id);
- $probe->last_update_user($pxt->user->id);
- $probe->customer_id($pxt->user->org_id);
- $probe->contact_group_id($contact_group_id) || 0;
-
- my $transaction = RHN::DB->connect();
- $transaction->nest_transactions();
-
- eval {
- $probe->commit;
- $probe->insert_check_probe;
- $probe->insert_probe_params(%probe_params);
- };
-
- if ($@ and catchable($@)) {
- my $E = $@;
- $transaction->nested_rollback();
- throw $E;
- }
- elsif ($@) {
- $transaction->nested_rollback();
- die $@;
- }
- $transaction->nested_commit();
-
- my $escaped = PXT::Utils->escapeHTML($probe->description());
-
- $pxt->push_message(site_info => "System Probe <strong>$escaped</strong> created.");
-
- my $pid = $probe->recid();
- $pxt->redirect("/network/systems/details/probes/details.pxt?sid=$sid&probe_id=$pid");
-
-}
-
-##################################
-sub build_system_probe_edit_form {
-##################################
- my $pxt = shift;
- my %params = @_;
-
- my $finished;
-
- my $sid = $pxt->param('sid');
- throw "no sid" unless $sid;
-
- my $probe_id = $pxt->param('probe_id');
- throw "no probe_id" unless $probe_id;
-
- my $probe = RHN::Probe->lookup(-recid => $probe_id);
-
- my $command = RHN::Command->lookup(id => $probe->command_id);
-
- my $form = new RHN::Form::ParsedForm(name => 'System Probe',
- label => 'system_probe',
- action => $params{action},
- );
-
- $form->add_widget( new RHN::Form::Widget::Literal(name => 'Probe Command', value => $command->description) );
-
- my $scout_description = $probe->scout_for_probe($probe_id);
- $form->add_widget( new RHN::Form::Widget::Literal(name => 'Monitoring Scout', value => $scout_description) );
-
- if ($command->requirements_description) {
- $form->add_widget(new RHN::Form::Widget::Literal(name => 'Probe Requirements',
- value => $command->requirements_description));
- }
-
- if ($command->version_support) {
- $form->add_widget(new RHN::Form::Widget::Literal(name => 'Supported Versions',
- value => $command->version_support));
- }
-
- $form->add_widget(new RHN::Form::Widget::Text(name => 'Probe Description',
- label => 'probe_description',
- size => 50,
- value => $probe->description,
- maxlength => 100,
- requires => {response => 1}));
-
- my $probe_notifications = $pxt->dirty_param('probe_notifications');
- # This relies on the edit_callback defining the value as 0 if it was a
- # javascript submit.
- if (not defined $probe_notifications) {
- $probe_notifications = $probe->notify_critical;
- }
- $form->add_widget(new RHN::Form::Widget::Checkbox(name => 'Probe Notifications',
- label => 'probe_notifications',
- auto_submit => 1,
- value => 1,
- checked => $probe_notifications));
- my @intervals = ( { value => '1', label => '1 minute' },
- { value => '5', label => '5 minutes' },
- { value => '10', label => '10 minutes' },
- { value => '15', label => '15 minutes' },
- { value => '30', label => '30 minutes' },
- { value => '45', label => '45 minutes' },
- { value => '60', label => '1 hour' },
- { value => '120', label => '2 hours' },
- { value => '360', label => '6 hours' },
- { value => '720', label => '12 hours' },
- { value => '1440', label => '24 hours' }
- );
-
-
- if ($probe_notifications) {
- # We're taking advantage of the fact that we've kept the name of the contact group and the
- # one member contact method in sync to present the contact group name which the user will
- # assume is the contact method.
- my $contact_groups = RHN::ContactGroup->list_groups($pxt->user, $sid);
- my @contact_group_options = map {{ value => $_->{ID},
- label => $_->{CONTACT_GROUP_NAME} }} @{$contact_groups};
-
- if (not @contact_group_options) {
- # setting the param to 0 effectively unchecks the checkbox. So here we uncheck the
- # checkbox and issue a message indicating that theres nothing to select.
- $pxt->dirty_param('probe_notifications', 0);
- $pxt->push_message(local_alert => "No notification methods have been defined.");
- }
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Notification Interval',
- label => 'probe_notification_interval_min',
- size => 1,
- value => $probe->notification_interval_minutes,
- options => [ @intervals ],
- requires => {response => 1}));
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Notification Method',
- label => 'cgid',
- size => 1,
- value => $probe->contact_group_id,
- options => [ @contact_group_options ],
- requires => {response => 1}));
- }
-
- $form->add_widget(new RHN::Form::Widget::Select(name => 'Probe Check Interval',
- label => 'probe_check_interval_min',
- size => 1,
- value => $probe->check_interval_minutes,
- options => [ @intervals ],
- requires => {response => 1}));
-
-
- my $command_params = RHN::CommandParameter->list_by_command($probe->command_id);
-
- my $saved_params = RHN::ProbeParam->list_probe_param_values($probe_id, $probe->command_id);
-
- my $formvar_prefix = 'param_';
-
- # XXX FIXME: this is probably woefully incomplete...
- my %validation_methods = ( float => [regexp => '^(\d+(\.(\d)+)?)?$'],
- integer => [numeric => 1],
- probestate => [regexp => '(OK|WARNING|CRITICAL|UNKNOWN)'],
- );
-
- foreach my $param (@{$command_params}) {
- next unless $param->{FIELD_VISIBLE};
-
- my $param_value = $pxt->dirty_param($param->{PARAM_NAME});
-
- foreach my $saved (@{$saved_params}) {
- if ($param->{PARAM_NAME} eq $saved->{PARAM_NAME}) {
- $param_value = $saved->{VALUE};
- }
- }
-
- my $field_type = $param->{FIELD_WIDGET_NAME};
- if ($field_type eq 'text') {
-
- my $data_type = $param->{DATA_TYPE_NAME};
- my @extra_requirements = exists $validation_methods{$data_type} ? @{$validation_methods{$data_type}} : ();
-
- if ($data_type eq 'password') {
- $form->add_widget(new RHN::Form::Widget::Password(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- default => $param_value,
- size => $param->{FIELD_VISIBLE_LENGTH},
- maxlength => $param->{FIELD_MAXIMUM_LENGTH},
- requires => [{response => $param->{MANDATORY} ? 1 : 0},
- @extra_requirements]
- ));
- }
- else {
- $form->add_widget(new RHN::Form::Widget::Text(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- size => $param->{FIELD_VISIBLE_LENGTH},
- maxlength => $param->{FIELD_MAXIMUM_LENGTH},
- #default => $param->{DEFAULT_VALUE},
- value => $param_value,
- requires => [{response => $param->{MANDATORY} ? 1 : 0},
- @extra_requirements]
- ));
- }
- }
- elsif ($field_type eq 'checkbox') {
- $form->add_widget(new RHN::Form::Widget::Checkbox(name => $param->{DESCRIPTION},
- label => $formvar_prefix . $param->{PARAM_NAME},
- value => 1,
- #checked => $param->{DEFAULT_VALUE} ? 1 : 0,
- checked => $param_value));
- }
- else {
- throw 'unknown widget type';
- }
- }
-
- $form->add_widget(new RHN::Form::Widget::Submit(name => 'Update Probe'));
- $form->add_widget(new RHN::Form::Widget::Hidden(name => 'sid', value => $sid));
- $form->add_widget(new RHN::Form::Widget::Hidden(name => 'probe_id', value => $probe_id));
-
- $form->add_widget(new RHN::Form::Widget::Hidden(name => 'pxt:trap', value => 'rhn:system_probe_edit_cb'));
-
- return $form;
-
-}
-
-###########################
-sub system_probe_edit_cb {
-###########################
- my $pxt = shift;
-
- #It's likely that we're here because of a javascript submit. Make sure that for
- #this case $pxt->('probe_notifications') is defined so that the checkbox knows what to do.
- if (not defined $pxt->dirty_param('probe_notifications')) {
- $pxt->param(probe_notifications => 0);
- }
-
- unless ($pxt->dirty_param('Update Probe')) {
- #return w/o doing anything if the update probe button wasn't pushed
- return;
- }
-
- my $form = build_system_probe_edit_form($pxt);
- my $response = $form->prepare_response;
-
- my $errors = Sniglets::Forms::load_params($pxt, $response);
-
- if (@{$errors}) {
- foreach my $error (@{$errors}) {
- $pxt->push_message(local_alert => $error);
- }
- return;
- }
-
- my $sid = $pxt->param('sid');
- throw "no sid" unless $sid;
-
- my $probe_id = $pxt->param('probe_id');
- throw "no probe id" unless $probe_id;
-
- my $probe = RHN::Probe->lookup(recid => $probe_id);
-
- my $probe_description = $pxt->dirty_param('probe_description');
- if ($probe_description ne $probe->description) {
- $probe->description($probe_description);
- }
-
- my $probe_notifications = $pxt->dirty_param('probe_notifications') || 0;
-
- if ($probe_notifications ne $probe->notify_critical) {
- $probe->notify_critical($probe_notifications);
- $probe->notify_warning($probe_notifications);
- $probe->notify_unknown($probe_notifications);
- $probe->notify_recovery($probe_notifications);
- }
-
- my $contact_group_id = $pxt->param('cgid');
- if ($contact_group_id ne $probe->contact_group_id) {
- $probe->contact_group_id($contact_group_id);
- }
-
- my $probe_check_interval_min = $pxt->dirty_param('probe_check_interval_min');
- if ($probe_check_interval_min ne $probe->check_interval_minutes) {
- $probe->check_interval_minutes($probe_check_interval_min);
- $probe->retry_interval_minutes($probe_check_interval_min);
- }
-
- #as the notif interval is a NOT NULL field, must default to something if notifs
- #are dropped from the probe configuration.
- my $probe_notification_interval_min = $pxt->dirty_param('probe_notification_interval_min') || 5;
- if ($probe_notification_interval_min ne $probe->notification_interval_minutes) {
- $probe->notification_interval_minutes($probe_notification_interval_min);
- }
-
- my $saved_params = RHN::ProbeParam->list_probe_param_values($probe_id, $probe->command_id);
-
- my @param_formvars = grep { m/param_/ } $pxt->param();
- my %modified_params;
-
- foreach my $param_formvar (@param_formvars) {
- my $param_name = $param_formvar;
- $param_name =~ s{^param_}{};
-
- # test the params to see if they've changed
- foreach my $saved (@{$saved_params}) {
- if ($param_name eq $saved->{PARAM_NAME} && ($saved->{VALUE} ne $pxt->dirty_param($param_formvar))) {
- $modified_params{$param_name} = $pxt->dirty_param($param_formvar);
- }
- }
- }
-
- ## Can we move probes from one scout to another?
- #if ($probe->sat_cluser_id ne $scout_id) {
- # $probe->sat_cluster_id($scout_id);
- #}
-
- if ($probe->last_update_user ne $pxt->user->id) {
- $probe->last_update_user($pxt->user->id);
- }
-
- my $transaction = RHN::DB->connect();
- $transaction->nest_transactions();
-
- my $params_to_update = RHN::ProbeParam->create;
-
- eval {
- $probe->commit;
- $params_to_update->update_probe_param_values($probe_id, %modified_params);
- };
-
- if ($@ and catchable($@)) {
- my $E = $@;
- $transaction->nested_rollback();
- throw $E;
- }
- elsif ($@) {
- $transaction->nested_rollback();
- die $@;
- }
- $transaction->nested_commit();
-
- my $escaped = PXT::Utils->escapeHTML($probe->description());
-
- $pxt->push_message(site_info => "System Probe <strong>$escaped</strong> updated.");
-}
-
sub probe_state_summary {
my $pxt = shift;
commit efc2cc3357b7568e1553891a9a39b0720da8cf3d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 19:49:47 2009 +0100
rhn:delete_probe_cb is not used, removing, as well as delete_probe_cb.
diff --git a/web/modules/sniglets/Sniglets/Probes.pm b/web/modules/sniglets/Sniglets/Probes.pm
index 526fbba..51925ff 100644
--- a/web/modules/sniglets/Sniglets/Probes.pm
+++ b/web/modules/sniglets/Sniglets/Probes.pm
@@ -55,7 +55,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:system_probe_creation_cb' => \&system_probe_creation_cb);
$pxt->register_callback('rhn:system_probe_edit_cb' => \&system_probe_edit_cb);
- $pxt->register_callback('rhn:delete_probe_cb' => \&delete_probe_cb);
}
######################################
@@ -706,31 +705,6 @@ sub system_probe_edit_cb {
$pxt->push_message(site_info => "System Probe <strong>$escaped</strong> updated.");
}
-#####################
-sub delete_probe_cb {
-#####################
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
- my $probe_id = $pxt->param('probe_id');
-
- unless ($pxt->dirty_param('brb_confirm')) {
- my $redir = $pxt->dirty_param('delete_confirm_page');
- throw "param 'delete_confirm_page' needed but not provided." unless $redir;
- $pxt->redirect($redir);
- }
-
- my $probe = RHN::Probe->lookup(-recid => $probe_id);
-
- $probe->delete_probe;
-
- my $desc = $probe->description;
- my $redir = $pxt->dirty_param('delete_success_page');
- throw "param 'delete_success_page' needed but not provided." unless $redir;
- $pxt->push_message(site_info => "System Probe \'$desc\' deleted.");
- $pxt->redirect($redir);
-}
-
sub probe_state_summary {
my $pxt = shift;
14 years, 4 months
- 1
- 0
Changes to 'refs/tags/spacewalk-web-0.8.3-1'
by Jan Pazdziora
Tag 'spacewalk-web-0.8.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-12-21 17:37 +0000
Tagging package [spacewalk-web] version [0.8.3-1] in directory [web/].
Changes since spacewalk-java-0.8.4-1:
Jan Pazdziora (28):
Removal of download_packages.pxt makes download_system_packages and package_download_for_system_cb not used, removing.
download_packages not used anywhere, removing as dead code.
Previous removals make element_count not used, removing.
add_packages_to_errata is not used, removing, as well as add_packages_to_errata_cb.
remove_packages_from_errata is not used, removing, as well as remove_packages_from_errata_cb.
add_packages_to_channel is not used, removing, as well as add_packages_to_channel_cb.
remove_packages_from_channel is not used, removing, as well as remove_packages_from_channel_cb.
update_channel_packages_from_errata is not used, removing, as well as add_channel_packages_cb.
package_remove_remote_command is not used, removing, as well as package_remove_remote_command_cb.
confirm_package_verify is not used, removing, as well as verify_packages_cb.
rhn:errata_editor:verify_errata_packages_in_channels is not used, removing, as well as verify_errata_packages_in_channels.
Removal of verify_errata_packages_in_channels makes has_latest_packages unused, removing.
Removal of verify_errata_packages_in_channels makes is_errata_for_channel unused, removing.
Removal of verify_errata_packages_in_channels makes errata_publish_cb and select_channels_cb unused, removing.
Removal of errata_publish_cb and select_channels_cb made assign_errata_to_channels unused, removing.
rhn:errata_editor:errata_delete_cb not used, errata_delete_cb did not exist, even.
rhn:errata_editor:delete_bug is not used, removing, as well as delete_bug.
Removal of delete_bug made delete_bug unused, removing.
rhn:errata_editor:mail_notification_cb is not used, removing, as well as mail_notification_cb.
Removal of mail_notification_cb made update_notification_queue unused, removing.
rhn:clone_specified_errata_cb is not used, removing, as well as clone_specified_errata_cb.
rhn:delete_errata_cb is not used, removing, as well as delete_errata_cb.
delete_errata not used anywhere, removing, as well as delete_errata_cb.
Removal of delete_errata_cb made delete_errata unused, removing.
Removal of errata_edit made load_package_set unused, removing.
Removal of load_package_set made packages_in_errata unused, removing.
replace_errata_packages not used anywhere, removing as dead code.
Automatic commit of package [spacewalk-web] release [0.8.3-1].
Tomas Lestach (1):
549391 - ISE when audit searching without any machine information
---
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 37 -
rel-eng/packages/spacewalk-web | 2
web/modules/rhn/RHN/DB/Channel.pm | 59 -
web/modules/rhn/RHN/DB/Errata.pm | 22
web/modules/rhn/RHN/DB/ErrataEditor.pm | 186 -----
web/modules/rhn/RHN/DB/Set.pm | 4
web/modules/sniglets/Sniglets/ErrataEditor.pm | 311 ---------
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 26
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 347 -----------
web/spacewalk-web.spec | 7
10 files changed, 27 insertions(+), 974 deletions(-)
---
14 years, 4 months
- 1
- 0
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit a3e2c954ac1ed86ab09e57b3b3e7188e8487f454
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Dec 21 18:37:42 2009 +0100
Automatic commit of package [spacewalk-web] release [0.8.3-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index fd6d7b0..132caad 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.8.2-1 web/
+0.8.3-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 9d6a88a..409fa4f 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.2
+Version: 0.8.3
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -299,6 +299,11 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Mon Dec 21 2009 Jan Pazdziora <jpazdziora(a)redhat.com> 0.8.3-1
+- removed a lot of dead code
+- modified to fit sha256 schema changes (michael.mraka(a)redhat.com)
+- adding channel.software.regenerateYumCache() api call (jsherril(a)redhat.com)
+
* Tue Dec 15 2009 Jan Pazdziora 0.8.2-1
- Removed dead code (PXT tags, xmlrpc, functions, modules).
14 years, 4 months
- 1
- 0
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/manager/audit/AuditManager.java | 37 +++++------
1 file changed, 20 insertions(+), 17 deletions(-)
New commits:
commit 4531e96e8a2d5b6bed5c9598e9d8810932310f8d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Dec 21 16:10:29 2009 +0100
549391 - ISE when audit searching without any machine information
just adding a check for null return value
diff --git a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
index 82b154c..85ae7ae 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/AuditManager.java
@@ -97,26 +97,29 @@ public class AuditManager /* extends BaseManager */ {
}
try {
- for (AuditReviewDto aureview : getMachineReviewSections(machine)) {
- fileStart = aureview.getStart().getTime();
- fileEnd = aureview.getEnd().getTime();
-
- if (fileEnd < start || fileStart > end) {
- continue;
- }
+ DataResult<AuditReviewDto> aureviewsections = getMachineReviewSections(machine);
+ if (aureviewsections != null) {
+ for (AuditReviewDto aureview : getMachineReviewSections(machine)) {
+ fileStart = aureview.getStart().getTime();
+ fileEnd = aureview.getEnd().getTime();
+
+ if (fileEnd < start || fileStart > end) {
+ continue;
+ }
- File auditLog = new File(
- logDirStr + "/" + aureview.getName() + "/audit/audit-" +
- (fileStart / 1000) + "-" +
- (fileEnd / 1000) + ".parsed");
+ File auditLog = new File(
+ logDirStr + "/" + aureview.getName() + "/audit/audit-" +
+ (fileStart / 1000) + "-" +
+ (fileEnd / 1000) + ".parsed");
- l = readAuditFile(auditLog, types, start, end);
+ l = readAuditFile(auditLog, types, start, end);
- if (dr == null) {
- dr = new DataResult(l);
- }
- else {
- dr.addAll(l);
+ if (dr == null) {
+ dr = new DataResult(l);
+ }
+ else {
+ dr.addAll(l);
+ }
}
}
}
14 years, 4 months
- 1
- 0
27 commits - web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/Channel.pm | 59 ---
web/modules/rhn/RHN/DB/Errata.pm | 22 -
web/modules/rhn/RHN/DB/ErrataEditor.pm | 186 ---------
web/modules/rhn/RHN/DB/Set.pm | 4
web/modules/sniglets/Sniglets/ErrataEditor.pm | 311 ----------------
web/modules/sniglets/Sniglets/ListView/ErrataList.pm | 26 -
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 347 ------------------
7 files changed, 955 deletions(-)
New commits:
commit 4c2ed47606788f5cb97da4f60dba8e050a3bfa51
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:57:27 2009 +0100
replace_errata_packages not used anywhere, removing as dead code.
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 0364a7e..07f704e 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -153,66 +153,6 @@ EOQ
return ($new_eid);
}
-#remove all packages from errata, and replace with contents of set.
-#Caller is responsible for making sure the user is allowed to do this
-sub replace_errata_packages {
- my $class = shift;
- my $errata = shift;
- my $set = shift;
-
- die "No errata" unless $errata;
-
- my $eid = $errata->id;
-
- my $eptable = $errata->table_map('rhnErrataPackage');
-
- my $query = <<EOQ;
-DELETE FROM $eptable
- WHERE errata_id = ?
-EOQ
-
- my $dbh = RHN::DB->connect();
- $dbh->nest_transactions;
- my $sth = $dbh->prepare($query);
-
- $sth->execute($eid);
-
- $query = <<EOQ;
-SELECT element
- FROM rhnSet
- WHERE label = :label
- AND user_id = :uid
-EOQ
-
- $sth = $dbh->prepare($query);
-
- $sth->execute_h(label => $set->label, user_id => $set->uid);
- my @pids;
-
- while (my ($pid) = $sth->fetchrow) {
- push @pids, $pid;
- }
-
- $query = <<EOQ;
-INSERT
- INTO $eptable
- (errata_id, package_id)
-VALUES (:eid, :pid)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- foreach my $pid (@pids) {
- $sth->execute_h(eid => $eid, pid => $pid);
- }
-
- $errata->refresh_erratafiles();
-
- $dbh->nested_commit;
-
- return 1;
-}
-
sub find_next_advisory {
my $adv = shift || '';
my $adv_name = shift || '';
commit 33a1786c97b914e7fe61fe562f73e46a449c0500
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:48:13 2009 +0100
Removal of load_package_set made packages_in_errata unused, removing.
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 0b2a900..0364a7e 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -27,38 +27,6 @@ use RHN::Exception qw/throw/;
use Params::Validate qw/:all/;
Params::Validate::validation_options(strip_leading => "-");
-sub packages_in_errata {
- my $class = shift;
- my $eid = shift;
- my $temp = shift || 0;
-
- die "No errata id!" unless $eid;
-
- my $dbh = RHN::DB->connect;
- my $query;
- my $sth;
-
- my $table = $temp ? 'rhnErrataPackageTmp' : 'rhnErrataPackage';
-
- $query = <<EOS;
- SELECT DISTINCT EP.package_id
- FROM $table EP
- WHERE EP.errata_id = ?
-EOS
-
- $sth = $dbh->prepare($query);
-
- $sth->execute($eid);
-
- my @result;
-
- while (my ($pid) = $sth->fetchrow) {
- push @result, $pid;
- }
-
- return @result;
-}
-
sub publish_errata {
my $class = shift;
my $temp_errata = shift;
commit 5f4769b4b8744c34ff327043057c895496914b6e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:46:14 2009 +0100
Removal of errata_edit made load_package_set unused, removing.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 90b28e9..8d91682 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -87,24 +87,6 @@ sub unless_var {
}
-sub load_package_set {
- my $uid = shift;
- my $eid = shift;
-
- my $set = RHN::Set->lookup(-label => 'errata_package_list', -uid => $uid);
- $set->empty;
- $set->commit;
-
- my @packages_in_errata =
- RHN::ErrataEditor->packages_in_errata($eid);
-
- $set->add(@packages_in_errata);
-
- $set->commit;
-
- return 1;
-}
-
sub if_errata_package_list_modified {
my $pxt = shift;
my %params = @_;
commit 363a5e4763baec2084a32fb05e4278e63004379c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:34:26 2009 +0100
Removal of delete_errata_cb made delete_errata unused, removing.
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index aba05fc..0b2a900 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -423,21 +423,5 @@ sub find_clones_of_errata {
return $data;
}
-sub delete_errata {
- my $class = shift;
- my $eid = shift;
-
- my $dbh = RHN::DB->connect;
- my $sth;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- die "Attempt to delete RHN errata '$eid'" unless $errata->org_id;
-
- $dbh->call_procedure('delete_errata', $eid);
-
- $dbh->commit;
-}
-
1;
commit a6988be8b70294d9f6b60a78cf23bb4ddd9bb97c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:33:56 2009 +0100
delete_errata not used anywhere, removing, as well as delete_errata_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
index 9810b8a..038aa4e 100644
--- a/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/ErrataList.pm
@@ -207,9 +207,6 @@ sub default_callback {
elsif ($label eq 'add_errata') {
return add_errata_to_channel($pxt);
}
- elsif ($label eq 'delete_errata') {
- return delete_errata_cb($pxt);
- }
return 1;
}
@@ -704,29 +701,6 @@ sub add_errata_to_channel {
return 1;
}
-sub delete_errata_cb {
- my $pxt = shift;
- my $set_label = $pxt->dirty_param('set_label');
-
- throw "No set_label" unless $set_label;
-
- my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my @eids = $set->contents;
-
- my $count = scalar(@eids);
-
- foreach my $eid (@eids) {
- RHN::ErrataEditor->delete_errata($eid);
- }
-
- $set->empty;
- $set->commit;
-
- $pxt->push_message(site_info => sprintf('Deleted <strong>%d</strong> errata.', $count));
-
- return 1;
-}
-
sub render_checkbox {
my $self = shift;
my %params = validate(@_, { row => 1, checked => 1, blank => 0, pxt => 0 });
commit 8cd33a836d7d0e909d78e50707868bee06c3b3d0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:26:46 2009 +0100
rhn:delete_errata_cb is not used, removing, as well as delete_errata_cb.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 1a1c371..90b28e9 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -39,7 +39,6 @@ sub register_callbacks {
my $pxt = shift;
$pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
- $pxt->register_callback('rhn:delete_errata_cb' => \&delete_errata_cb);
}
sub update_errata_cache {
@@ -129,17 +128,4 @@ sub if_errata_package_list_modified {
return '';
}
-sub delete_errata_cb {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
- my $advisory = $errata->advisory;
-
- RHN::ErrataEditor->delete_errata($eid);
-
- $pxt->push_message(site_info => "Deleted errata <strong>$advisory</strong>.");
- $pxt->redirect('/network/errata/manage/list/published.pxt');
-}
-
1;
commit b436257fd31c332867fa1c4cedb385aef2452f07
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:18:43 2009 +0100
rhn:clone_specified_errata_cb is not used, removing, as well as clone_specified_errata_cb.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 3b2cb52..1a1c371 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -39,7 +39,6 @@ sub register_callbacks {
my $pxt = shift;
$pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
- $pxt->register_callback('rhn:clone_specified_errata_cb' => \&clone_specified_errata_cb);
$pxt->register_callback('rhn:delete_errata_cb' => \&delete_errata_cb);
}
@@ -130,26 +129,6 @@ sub if_errata_package_list_modified {
return '';
}
-sub clone_specified_errata_cb {
- my $pxt = shift;
- my $eid = $pxt->param('eid');
-
- throw "No eid" unless $eid;
-
- my $set_label = 'clone_errata_list';
- my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- $set->empty;
- $set->add($eid);
- $set->commit;
-
- my $redir = $pxt->dirty_param('redir');
- throw "param redir needed" unless $redir;
-
- $pxt->redirect($redir . "?set_label=${set_label}");
-
- return;
-}
-
sub delete_errata_cb {
my $pxt = shift;
my $eid = $pxt->param('eid');
commit bc71aa86a5edd3dec3d03ecdb8a44e55e0afb13a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:11:52 2009 +0100
Removal of mail_notification_cb made update_notification_queue unused, removing.
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index 4c3aeb9..aba05fc 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -245,34 +245,6 @@ EOQ
return 1;
}
-# schedule errata notices for all orgs that have access to a channel
-# that this errata affects, instead of just the org that owns the
-# errata
-
-sub update_notification_queue {
- my $class = shift;
-
- my $eid = shift;
- my $minutes_from_now = shift || 0;
-
- my $dbh = RHN::DB->connect;
-
- $dbh->do('DELETE FROM rhnErrataQueue ENQ WHERE ENQ.errata_id = ?', { }, $eid);
-
- my $sth = $dbh->prepare(<<EOQ);
-INSERT INTO rhnErrataQueue
- (errata_id, next_action)
-VALUES
- (:errata_id, sysdate + :minutes/1440)
-EOQ
-
- $sth->execute_h(errata_id => $eid, minutes => $minutes_from_now);
-
- $dbh->commit;
-
- return;
-}
-
sub find_next_advisory {
my $adv = shift || '';
my $adv_name = shift || '';
commit ec52e800cdd342ad0c9adf22dc4bc603812119d5
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:08:52 2009 +0100
rhn:errata_editor:mail_notification_cb is not used, removing, as well as mail_notification_cb.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 2101437..3b2cb52 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,7 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:mail_notification_cb' => \&mail_notification_cb);
$pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
$pxt->register_callback('rhn:clone_specified_errata_cb' => \&clone_specified_errata_cb);
$pxt->register_callback('rhn:delete_errata_cb' => \&delete_errata_cb);
@@ -131,21 +130,6 @@ sub if_errata_package_list_modified {
return '';
}
-sub mail_notification_cb {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid');
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
- throw "Errata '$eid' not published." if ($errata->isa('RHN::DB::ErrataTmp'));
-
- RHN::ErrataEditor->update_notification_queue($eid, 0);
-
- $pxt->push_message(site_info => sprintf('An errata mail update has been scheduled for <strong>%s</strong>.', $errata->synopsis));
-
- return;
-}
-
sub clone_specified_errata_cb {
my $pxt = shift;
my $eid = $pxt->param('eid');
commit 373d269f4ce7e507d2d12fa57b54e63953b6682a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:06:38 2009 +0100
Removal of delete_bug made delete_bug unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Errata.pm b/web/modules/rhn/RHN/DB/Errata.pm
index bec1f1d..90d6bc5 100644
--- a/web/modules/rhn/RHN/DB/Errata.pm
+++ b/web/modules/rhn/RHN/DB/Errata.pm
@@ -475,28 +475,6 @@ EOQ
return;
}
-sub delete_bug {
- my $self = shift;
- my $id = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $bl_table = $self->table_map('rhnErrataBugList');
-
- my $query = <<EOQ;
-DELETE FROM $bl_table
- WHERE errata_id = ?
- AND bug_id = ?
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute($self->id, $id);
-
- $dbh->commit;
-
- return;
-}
-
sub keywords {
my $self = shift;
my $dbh = RHN::DB->connect;
commit e5499260e7f88da0658c41bcc88093f6af8da5a0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:05:59 2009 +0100
rhn:errata_editor:delete_bug is not used, removing, as well as delete_bug.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 1196dab..2101437 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,7 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:delete_bug' => \&delete_bug);
$pxt->register_callback('rhn:errata_editor:mail_notification_cb' => \&mail_notification_cb);
$pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
$pxt->register_callback('rhn:clone_specified_errata_cb' => \&clone_specified_errata_cb);
@@ -132,27 +131,6 @@ sub if_errata_package_list_modified {
return '';
}
-sub delete_bug {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
- my $bug_id = $pxt->dirty_param('bug_id') || 0;
-
- return unless ($eid && $bug_id);
-
- throw "user '" . $pxt->user->id . "' does not own errata '$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- my $errata;
-
- $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- $errata->delete_bug($bug_id);
-
- $pxt->redirect($pxt->uri . sprintf('?eid=%d', $eid));
- return;
-}
-
sub mail_notification_cb {
my $pxt = shift;
commit e2b466bc9af3b59dcf89685541354ca10042c7bf
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:05:10 2009 +0100
rhn:errata_editor:errata_delete_cb not used, errata_delete_cb did not exist, even.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index cb3cb74..1196dab 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,7 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:errata_delete_cb' => \&errata_delete_cb);
$pxt->register_callback('rhn:errata_editor:delete_bug' => \&delete_bug);
$pxt->register_callback('rhn:errata_editor:mail_notification_cb' => \&mail_notification_cb);
$pxt->register_callback('rhn:update_errata_cache' => \&update_errata_cache);
commit bdc9b46199c933fe3c8c80968ce1ed30e0f9fe61
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:03:32 2009 +0100
Removal of errata_publish_cb and select_channels_cb made assign_errata_to_channels unused, removing.
diff --git a/web/modules/rhn/RHN/DB/ErrataEditor.pm b/web/modules/rhn/RHN/DB/ErrataEditor.pm
index b952d29..4c3aeb9 100644
--- a/web/modules/rhn/RHN/DB/ErrataEditor.pm
+++ b/web/modules/rhn/RHN/DB/ErrataEditor.pm
@@ -245,56 +245,6 @@ EOQ
return 1;
}
-sub assign_errata_to_channels {
- my $class = shift;
- my $eid = shift;
- my $channels = shift;
- my $transaction = shift;
-
- my $dbh = $transaction || RHN::DB->connect();
- $dbh->nest_transactions;
-
- my $query = <<EOQ;
-DELETE FROM rhnChannelErrata
- WHERE errata_id = ?
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute($eid);
-
- $query = <<EOQ;
-INSERT INTO rhnChannelErrata
- (errata_id, channel_id)
-VALUES (?, ?)
-EOQ
-
- $sth = $dbh->prepare($query);
-
- my $rrqh = $dbh->prepare(<<EOQ);
-INSERT
- INTO rhnRepoRegenQueue
- (id, channel_label, client, reason, force, bypass_filters, next_action, created, modified)
-VALUES (rhn_repo_regen_queue_id_seq.nextval,
- :label, 'perl-web', 'assign_errata_to_channels', 'N', 'N', sysdate, sysdate, sysdate)
-EOQ
-
- foreach my $cid (@{$channels}) {
- $sth->execute($eid, $cid);
- my $channel = RHN::Channel->lookup(-id => $cid);
- $rrqh->execute(label => $channel->label);
- }
-
- $sth->finish;
- $rrqh->finish;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
- $errata->refresh_erratafiles;
-
- $dbh->nested_commit;
-
- return 1;
-}
-
# schedule errata notices for all orgs that have access to a channel
# that this errata affects, instead of just the org that owns the
# errata
commit ff11991f0de7488dee4d823b8fdf897693787a22
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 16:00:12 2009 +0100
Removal of verify_errata_packages_in_channels makes errata_publish_cb and select_channels_cb unused, removing.
Also rhn:errata_editor:errata_publish_cb and rhn:errata_editor:select_channels_cb can go.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index f34253e..cb3cb74 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -38,8 +38,6 @@ sub register_callbacks {
my $class = shift;
my $pxt = shift;
- $pxt->register_callback('rhn:errata_editor:errata_publish_cb' => \&errata_publish_cb);
- $pxt->register_callback('rhn:errata_editor:select_channels_cb' => \&select_channels_cb);
$pxt->register_callback('rhn:errata_editor:errata_delete_cb' => \&errata_delete_cb);
$pxt->register_callback('rhn:errata_editor:delete_bug' => \&delete_bug);
$pxt->register_callback('rhn:errata_editor:mail_notification_cb' => \&mail_notification_cb);
@@ -48,131 +46,6 @@ sub register_callbacks {
$pxt->register_callback('rhn:delete_errata_cb' => \&delete_errata_cb);
}
-sub errata_publish_cb {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
- throw 'No eid!' unless $eid;
-
- throw "user '" . $pxt->user->id . "' does not own errata '$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- my @channels = ();
-
- my $channel_set = RHN::Set->lookup(-label => 'target_channels_list', -uid => $pxt->user->id);
- push @channels, $channel_set->contents;
-
- $channel_set->empty;
- $channel_set->commit;
-
- if (not $pxt->user->verify_channel_admin(@channels)) {
- warn sprintf("User '%d' attempted to assign unpublished errata '%d' to one or more channels (%s) without permission.",
- $pxt->user->id, $eid, join(', ', @channels));
- $pxt->redirect('/errors/permission.pxt');
- }
-
- my $fail_redir = $pxt->dirty_param('fail_redirect');
- throw "Param 'fail_redir' needed but not provided." unless $fail_redir;
-
- my $id;
- my $dbh = RHN::DB->connect;
- eval {
- $id = RHN::ErrataEditor->publish_errata($errata, $dbh);
- RHN::ErrataEditor->assign_errata_to_channels($id, \@channels);
- };
- if ($@) {
- $dbh->rollback;
- if (ref $@ and catchable($@)) {
- my $E = $@;
-
- if ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_UQ') {
- $pxt->push_message(local_alert => 'A published errata with this advisory already exists.');
- }
- elsif ($E->constraint_value eq 'RHN_ERRATA_ADVISORY_NAME_UQ') {
- $pxt->push_message(local_alert => 'A published errata with this advisory name already exists');
- }
- else {
- throw $E;
- }
- $pxt->redirect($fail_redir . "?eid=${eid}"); # still here? redirect.
- }
- else {
- die $@;
- }
- }
-
- $dbh->commit;
-
- foreach my $cid (@channels) {
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid, 0);
- }
-
- my $package_list_edited = $pxt->session->get('errata_package_list_edited') || { };
- $package_list_edited->{$eid} = 0;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
-
- $pxt->push_message(site_info => sprintf ('Errata <strong>%s</strong> has been successfully published to <strong>%d</strong> channel%s.', $errata->advisory_name, scalar(@channels), (scalar(@channels) == 1 ? '' : 's')));
-
- my $redir = $pxt->dirty_param('success_redirect');
- throw "param 'success_redirect' needed but not provided" unless $redir;
-
- $pxt->redirect($redir);
-
- return;
-}
-
-sub select_channels_cb {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
- throw 'No eid!' unless $eid;
-
- throw "user '" . $pxt->user->id . "' does not own errata '$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- my $errata = RHN::Errata->lookup(-id => $eid);
-
- my @channels = ();
-
- my $channel_set = RHN::Set->lookup(-label => 'target_channels_list', -uid => $pxt->user->id);
- push @channels, $channel_set->contents;
-
- $channel_set->empty;
- $channel_set->commit;
-
- if (not $pxt->user->verify_channel_admin(@channels)) {
- warn sprintf("User '%d' attempted to assign errata '%d' to one or more channels (%s) without permission.",
- $pxt->user->id, $eid, join(', ', @channels));
- $pxt->redirect('/errors/permission.pxt');
- }
-
- my @old_channels = RHN::Errata->channels($eid); #need to keep these!
-
- RHN::ErrataEditor->assign_errata_to_channels($eid, \@channels);
-
- my %all_channels = map { ($_, 1) } (@old_channels, @channels);
- my @all_affected_channels = keys %all_channels;
-
- foreach my $cid (@all_affected_channels) {
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid, 3600);
- }
-
- my $package_list_edited = $pxt->session->get('errata_package_list_edited') || { };
- $package_list_edited->{$eid} = time;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
-
- $pxt->push_message(site_info => sprintf ('Errata <strong>%s</strong> has been successfully assigned to <strong>%d</strong> channel%s.', $errata->advisory_name, scalar(@channels), (scalar(@channels) == 1 ? '' : 's')));
-
- my $redir = $pxt->dirty_param('success_redirect');
- throw "param 'success_redirect' needed but not provided" unless $redir;
-
- $pxt->redirect($redir . "?eid=$eid");
-
- return;
-}
-
sub update_errata_cache {
my $pxt = shift;
my $eid = $pxt->param('eid');
commit c6fd58083b708a28c3a807c21069bfa1e5aad55d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 15:57:46 2009 +0100
Removal of verify_errata_packages_in_channels makes is_errata_for_channel unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 268516b..d8c4fd0 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1756,27 +1756,4 @@ sub channel_type_capable {
return 1;
}
-# return true if an errata is 'for' a channel.
-sub is_errata_for_channel {
- my $class = shift;
- my $eid = shift;
- my $cid = shift;
-
- my $dbh = RHN::DB->connect;
-
- my $sth = $dbh->prepare(<<EOQ);
-SELECT 1
- FROM rhnChannelErrata CE
- WHERE CE.channel_id = :cid
- AND CE.errata_id = :eid
-EOQ
-
- $sth->execute_h(cid => $cid, eid => $eid);
-
- my ($res) = $sth->fetchrow;
- $sth->finish;
-
- return $res ? 1 : 0;
-}
-
1;
commit e792a6b8dc77c44333005d5a44bda701e1a6a816
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 15:54:52 2009 +0100
Removal of verify_errata_packages_in_channels makes has_latest_packages unused, removing.
diff --git a/web/modules/rhn/RHN/DB/Channel.pm b/web/modules/rhn/RHN/DB/Channel.pm
index 6ed04ef..268516b 100644
--- a/web/modules/rhn/RHN/DB/Channel.pm
+++ b/web/modules/rhn/RHN/DB/Channel.pm
@@ -1486,42 +1486,6 @@ EOQ
return %ret;
}
-# If a package from the incoming list exists in a channel, the version
-# in the channel must be greater than or equal to the version of the
-# incoming package. If not, return true.
-sub has_latest_packages {
- my $class = shift;
- my $cid = shift;
- my @pids = @_;
-
- my $dbh = RHN::DB->connect;
- my @newer;
-
- foreach my $pid (@pids) {
- my $query =<<EOQ;
-SELECT 1
- FROM rhnPackage P1, rhnPackageEVR PE1, rhnChannelNewestPackage CNP, rhnPackageEVR PE2
- WHERE P1.id = :package_id
- AND CNP.channel_id = :channel_id
- AND P1.name_id = CNP.name_id
- AND P1.package_arch_id = CNP.package_arch_id
- AND PE1.id = P1.evr_id
- AND PE2.id = CNP.evr_id
- AND rpm.vercmp(PE1.epoch, PE1.version, PE1.release, PE2.epoch, PE2.version, PE2.release) > 0
-EOQ
-
- my $sth = $dbh->prepare($query);
- $sth->execute_h(package_id => $pid, channel_id => $cid);
-
- my ($pid_newer) = $sth->fetchrow || 0;
- $sth->finish;
-
- push @newer, $pid if $pid_newer;
- }
-
- return (@newer) ? 0 : 1;
-}
-
sub remove_packages_in_set {
my $self = shift;
my %attr = validate_with(params => \@_, spec => { set_label => 1, user_id => 1 }, strip_leading => '-');
commit e1d574bad70fd654251ebeee4fe111cb215424a4
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 15:52:31 2009 +0100
rhn:errata_editor:verify_errata_packages_in_channels is not used, removing, as well as verify_errata_packages_in_channels.
diff --git a/web/modules/sniglets/Sniglets/ErrataEditor.pm b/web/modules/sniglets/Sniglets/ErrataEditor.pm
index 0a4c1ee..f34253e 100644
--- a/web/modules/sniglets/Sniglets/ErrataEditor.pm
+++ b/web/modules/sniglets/Sniglets/ErrataEditor.pm
@@ -39,7 +39,6 @@ sub register_callbacks {
my $pxt = shift;
$pxt->register_callback('rhn:errata_editor:errata_publish_cb' => \&errata_publish_cb);
- $pxt->register_callback('rhn:errata_editor:verify_errata_packages_in_channels' => \&verify_errata_packages_in_channels);
$pxt->register_callback('rhn:errata_editor:select_channels_cb' => \&select_channels_cb);
$pxt->register_callback('rhn:errata_editor:errata_delete_cb' => \&errata_delete_cb);
$pxt->register_callback('rhn:errata_editor:delete_bug' => \&delete_bug);
@@ -124,97 +123,6 @@ sub errata_publish_cb {
return;
}
-# The flow: If the errata is being published to a channel for which
-# the user is an admin, and the errata has packages which are newer
-# than packages in the channel, then ask the user if he wants to push
-# the newer versions into that channel. Else, just publish the errata.
-sub verify_errata_packages_in_channels {
- my $pxt = shift;
-
- my $eid = $pxt->param('eid') || 0;
- throw 'No eid!' unless $eid;
-
- throw "user '" . $pxt->user->id . "' does not own errata '$eid'"
- unless $pxt->user->verify_errata_admin($eid);
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- my @channels = ();
-
- foreach my $param ($pxt->param()) {
- next unless $param =~ /^channel_/;
- push @channels, $pxt->dirty_param($param);
- }
-
- my $target_set = RHN::Set->lookup(-label => 'target_channels_list', -uid => $pxt->user->id);
- $target_set->empty;
- $target_set->add(@channels);
- $target_set->commit;
-
- my $action_type;
- if ($pxt->dirty_param('publish_errata')) {
- $action_type = 'publish_errata';
- }
- elsif ($pxt->dirty_param('update_channels')) {
- $action_type = 'update_channels';
- }
- else {
- throw "The action type parameter is missing. It should have been preserved."
- }
-
- my @updates_needed;
-
- foreach my $cid (@channels) {
- die "User '" . $pxt->user->id . "' does not have permission to publish errata '$eid' to channel '$cid'"
- unless $pxt->user->verify_channel_admin($cid);
-
- push @updates_needed, $cid
- unless RHN::Channel->has_latest_packages($cid, $errata->packages);
- }
-
- if (@updates_needed) {
- my $cid = pop @updates_needed;
-
- my $package_set = RHN::Set->lookup(-label => 'update_package_list', -uid => $pxt->user->id);
- $package_set->empty;
-
- my $eid_cloned_from = $errata->cloned_from;
- my $cid_cloned_from = RHN::Channel->channel_cloned_from($cid);
-
- if ($eid_cloned_from and $cid_cloned_from
- and RHN::Channel->is_errata_for_channel($eid_cloned_from, $cid_cloned_from)) {
- my $ds = new RHN::DataSource::Package(-mode => 'channel_errata_full_intersection');
- my $data = $ds->execute_full(-eid => $eid_cloned_from, -cid => $cid_cloned_from);
-
- if (@{$data}) {
- $package_set->add(map { $_->{ID} } @{$data});
- $pxt->push_message(local_info => 'This errata is cloned from an official Red Hat errata, and the channel you are publishing this errata to is the clone of a Red Hat channel. Packages which are associated with the original channel and errata are preselected below.');
- }
- }
- $package_set->commit;
-
- my $channel_set = RHN::Set->lookup(-label => 'update_channels_list', -uid => $pxt->user->id);
- $channel_set->empty;
- $channel_set->add(@updates_needed);
- $channel_set->commit;
-
- my $redir = $pxt->dirty_param('update_channel_redirect');
-
- throw "Param 'update_channel_redirect' needed but not provided"
- unless $redir;
-
- $pxt->redirect($redir . "?eid=${eid}&cid=${cid}&${action_type}=1");
- }
- elsif ($action_type eq 'publish_errata') {
- errata_publish_cb($pxt);
- }
- else {
- select_channels_cb($pxt);
- }
-
- return;
-}
-
sub select_channels_cb {
my $pxt = shift;
commit c9c082c6ac7710244f8392d613b132b9a3c8c43a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:51:03 2009 +0100
confirm_package_verify is not used, removing, as well as verify_packages_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 1530add..19fb352 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -286,9 +286,6 @@ sub default_callback {
elsif ($label eq 'confirm_package_install') {
return install_packages_cb($pxt);
}
- elsif ($label eq 'confirm_package_verify') {
- return verify_packages_cb($pxt);
- }
elsif ($label eq 'package_install_remote_command') {
return install_packages_cb($pxt, 'package_install_remote_command');
}
@@ -1383,42 +1380,6 @@ sub install_packages_cb {
return wantarray ? @action_order : 1;
}
-sub verify_packages_cb {
- my $pxt = shift;
-
- my $sid = $pxt->param('sid');
-
- my $package_set_label = $pxt->dirty_param('set_label');
- throw "No package set label" unless $package_set_label;
-
- my $package_set = RHN::Set->lookup(-label => $package_set_label, -uid => $pxt->user->id);
-
- my $earliest_date = RHN::Date->now->long_date;
- my $actions_scheduled =
- RHN::Scheduler->schedule_system_package_action(-org_id => $pxt->user->org_id,
- -user_id => $pxt->user->id,
- -earliest => $earliest_date,
- -sid => $sid,
- -id_combos => [ $package_set->contents ],
- -action_type => 'verify',
- );
-
- my $system = RHN::Server->lookup(-id => $sid);
-
- foreach my $action_id (keys %{$actions_scheduled}) {
- my $package_count = scalar @{$actions_scheduled->{$action_id}};
- $pxt->push_message(site_info =>
- sprintf('<strong>%d</strong> package verif%s been <a href="/network/systems/details/history/event.pxt?sid=%d&hid=%d">scheduled</a> for <a href="/rhn/systems/details/Overview.do?sid=%d"><strong>%s</strong></a>.',
- $package_count, $package_count == 1 ? 'y has' : 'ies have', $system->id, $action_id,
- $sid, PXT::Utils->escapeHTML($system->name)));
- }
-
- $package_set->empty;
- $package_set->commit;
-
- return 1;
-}
-
sub ssm_install_packages_cb {
my $pxt = shift;
my $mode = shift || 'confirm_ssm_package_install';
commit 486d402516401863e901f21f265b0c84376cb674
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:42:00 2009 +0100
package_remove_remote_command is not used, removing, as well as package_remove_remote_command_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 1e95b87..1530add 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -298,9 +298,6 @@ sub default_callback {
elsif ($label eq 'ssm_package_install_answer_files') {
return ssm_install_packages_cb($pxt, 'ssm_package_install_answer_files');
}
- elsif ($label eq 'package_remove_remote_command') {
- return package_remove_remote_command_cb($pxt);
- }
elsif ($label eq 'remove_patches_from_channel') {
return remove_patches_from_channel_cb($pxt);
}
@@ -1456,16 +1453,6 @@ sub package_install_remote_command_cb {
return 1;
}
-sub package_remove_remote_command_cb {
- my $pxt = shift;
- my $sid = $pxt->param('sid');
- my $set_label = $pxt->dirty_param('set_label');
-
- $pxt->redirect("/rhn/systems/details/packages/ScheduleRemoteCommand.do?sid=$sid&set_label=$set_label&mode=package_remove");
-
- return 1;
-}
-
my %adv_icon = ('Bug Fix Advisory' => '/img/wrh-bug.gif',
'Product Enhancement Advisory' => '/img/wrh-product.gif',
'Security Advisory' => '/img/wrh-security.gif');
commit 5b78d8d30b35beaa1ff181e5f9badae466577cae
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:31:16 2009 +0100
update_channel_packages_from_errata is not used, removing, as well as add_channel_packages_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 070cf21..1e95b87 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -301,9 +301,6 @@ sub default_callback {
elsif ($label eq 'package_remove_remote_command') {
return package_remove_remote_command_cb($pxt);
}
- elsif ($label eq 'update_channel_packages_from_errata') {
- return add_channel_packages_cb($pxt);
- }
elsif ($label eq 'remove_patches_from_channel') {
return remove_patches_from_channel_cb($pxt);
}
@@ -2070,86 +2067,6 @@ sub empty_set_action_cb { #overridden from ListView::List
return $self->SUPER::empty_set_action_cb($pxt, %action);
}
-sub add_channel_packages_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->dirty_param('set_label');
- my $channel_id = $pxt->param('cid');
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- RHN::ChannelEditor->add_channel_packages($channel_id, $package_set->contents);
- RHN::Channel->refresh_newest_package_cache($channel_id, 'web.errata_cloning');
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $channel_id, 0);
-
- if (RHN::Channel->channel_type_capable($channel_id, 'errata')) {
- my $package_list_edited = $pxt->session->get('package_list_edited') || { };
- $package_list_edited->{$channel_id} = 0;
- $pxt->session->set(package_list_edited => $package_list_edited);
- }
-
- $package_set->empty;
- $package_set->commit;
-
- my $action_type;
- if ($pxt->dirty_param('publish_errata')) {
- $action_type = 'publish_errata';
- }
- elsif ($pxt->dirty_param('update_channels')) {
- $action_type = 'update_channels';
- }
- else {
- throw "The action type parameter is missing. It should have been preserved."
- }
-
- my $channel_set = RHN::Set->lookup(-label => 'update_channels_list', -uid => $pxt->user->id);
-
- my @updates_needed = $channel_set->contents;
-
- if (@updates_needed) {
- my $cid = pop @updates_needed;
-
- my $next_package_set = RHN::Set->lookup(-label => 'update_package_list', -uid => $pxt->user->id);
- $next_package_set->empty;
-
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $pxt->param('eid'));
- my $eid_cloned_from = $errata->cloned_from;
- my $cid_cloned_from = RHN::Channel->channel_cloned_from($cid);
-
- if ($eid_cloned_from and $cid_cloned_from
- and RHN::Channel->is_errata_for_channel($eid_cloned_from, $cid_cloned_from)) {
- my $ds = new RHN::DataSource::Package(-mode => 'channel_errata_full_intersection');
- my $data = $ds->execute_full(-eid => $eid_cloned_from, -cid => $cid_cloned_from);
-
- if (@{$data}) {
- $next_package_set->add(map { $_->{ID} } @{$data});
- $pxt->push_message(local_info => 'This errata is cloned from an official Red Hat errata, and the channel you are publishing this errata to is the clone of a Red Hat channel. Packages which are associated with the original channel and errata are preselected below.');
- }
- }
- $next_package_set->commit;
-
- $channel_set->empty;
- $channel_set->add(@updates_needed);
- $channel_set->commit;
-
- my $redir = $pxt->dirty_param('update_channel_redirect');
-
- throw "Param 'update_channel_redirect' needed but not provided"
- unless $redir;
-
- my $eid = $pxt->param('eid');
- # bugzilla: 197966 - need to retain the action_type
- $pxt->redirect($redir . "?eid=${eid}&cid=${cid}&${action_type}=1");
- }
- elsif ($action_type eq 'publish_errata') {
- Sniglets::ErrataEditor::errata_publish_cb($pxt);
- }
- else {
- Sniglets::ErrataEditor::select_channels_cb($pxt);
- }
-
- return 1;
-}
-
sub remove_patches_from_channel_cb {
my $pxt = shift;
commit e3e70c82ba7762a685ef929e9c26708c3c39541c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:19:32 2009 +0100
remove_packages_from_channel is not used, removing, as well as remove_packages_from_channel_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 025f086..070cf21 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -304,9 +304,6 @@ sub default_callback {
elsif ($label eq 'update_channel_packages_from_errata') {
return add_channel_packages_cb($pxt);
}
- elsif ($label eq 'remove_packages_from_channel') {
- return remove_packages_from_channel_cb($pxt);
- }
elsif ($label eq 'remove_patches_from_channel') {
return remove_patches_from_channel_cb($pxt);
}
@@ -2153,40 +2150,6 @@ sub add_channel_packages_cb {
return 1;
}
-sub remove_packages_from_channel_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->dirty_param('set_label');
- throw "No package set label" unless $set_label;
-
- my $cid = $pxt->param('cid');
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- $channel->remove_packages_in_set(-set_label => $set_label, -user_id => $pxt->user->id);
-
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- my $count = scalar $package_set->contents;
-
- $package_set->empty;
- $package_set->commit;
-
- RHN::Channel->refresh_newest_package_cache($channel->id, 'web.channel_manager');
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $channel->id, 3600);
-
- if (RHN::Channel->channel_type_capable($channel->id, 'errata')) {
- my $package_list_edited = $pxt->session->get('package_list_edited') || { };
- $package_list_edited->{$channel->id} = time;
- $pxt->session->set(package_list_edited => $package_list_edited);
- }
-
- $pxt->push_message(site_info => sprintf("<strong>%d</strong> package%s removed from channel <strong>%s</strong>.",
- $count, $count == 1 ? '' : 's',
- $channel->name));
-
- return 1;
-}
-
sub remove_patches_from_channel_cb {
my $pxt = shift;
commit 5729b093665e8eb8e5ed38fa46c77565f6d3684e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:17:15 2009 +0100
add_packages_to_channel is not used, removing, as well as add_packages_to_channel_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 39a22e8..025f086 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -310,9 +310,6 @@ sub default_callback {
elsif ($label eq 'remove_patches_from_channel') {
return remove_patches_from_channel_cb($pxt);
}
- elsif ($label eq 'add_packages_to_channel') {
- return add_packages_to_channel_cb($pxt);
- }
elsif ($label eq 'add_patches_to_channel') {
return add_patches_to_channel_cb($pxt);
}
@@ -2219,40 +2216,6 @@ sub remove_patches_from_channel_cb {
return 1;
}
-sub add_packages_to_channel_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->dirty_param('set_label');
- throw "No package set label" unless $set_label;
-
- my $cid = $pxt->param('cid');
- my $channel = RHN::Channel->lookup(-id => $cid);
-
- $channel->add_packages_in_set(-set_label => $set_label, -user_id => $pxt->user->id);
-
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- my $count = scalar $package_set->contents;
-
- $package_set->empty;
- $package_set->commit;
-
- RHN::Channel->refresh_newest_package_cache($channel->id, 'web.channel_manager');
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $channel->id, 3600);
-
- if (RHN::Channel->channel_type_capable($channel->id, 'errata')) {
- my $package_list_edited = $pxt->session->get('package_list_edited') || { };
- $package_list_edited->{$channel->id} = time;
- $pxt->session->set(package_list_edited => $package_list_edited);
- }
-
- $pxt->push_message(site_info => sprintf("<strong>%d</strong> package%s added to channel <strong>%s</strong>.",
- $count, $count == 1 ? '' : 's',
- $channel->name));
-
- return 1;
-}
-
sub add_patches_to_channel_cb {
my $pxt = shift;
commit d36d7e299244069d18e1523be768fc8d78a4880e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 14:09:20 2009 +0100
remove_packages_from_errata is not used, removing, as well as remove_packages_from_errata_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 7b25671..39a22e8 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -319,9 +319,6 @@ sub default_callback {
elsif ($label eq 'add_patchsets_to_channel') {
return add_patchsets_to_channel_cb($pxt);
}
- elsif ($label eq 'remove_packages_from_errata') {
- return remove_packages_from_errata_cb($pxt);
- }
elsif ($label eq 'sync_packages_to_channel') {
return sync_packages_to_channel_cb($pxt);
}
@@ -2310,43 +2307,6 @@ sub add_patchsets_to_channel_cb {
return 1;
}
-sub remove_packages_from_errata_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->dirty_param('set_label');
- throw "No package set label" unless $set_label;
-
- my $eid = $pxt->param('eid');
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- $errata->remove_packages_in_set(-set_label => $set_label, -user_id => $pxt->user->id);
-
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- my $count = scalar $package_set->contents;
-
- $package_set->empty;
- $package_set->commit;
-
- unless ($errata->isa('RHN::DB::ErrataTmp')) {
-
- foreach my $cid (RHN::Errata->channels($eid)) {
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid, 3600);
- }
- my $package_list_edited = $pxt->session->get('errata_package_list_edited') || { };
- $package_list_edited->{$eid} = time;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
- }
-
- $errata->refresh_erratafiles;
-
- $pxt->push_message(site_info => sprintf("<strong>%d</strong> package%s removed from errata <strong>%s</strong>.",
- $count, $count == 1 ? '' : 's',
- $errata->advisory));
-
- return 1;
-}
-
sub datasource_result_into_manifest {
my $data = shift;
my $org_id = shift;
commit 78140bf60ff0bc592a0fd91a9842ff093ad9517c
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 13:59:45 2009 +0100
add_packages_to_errata is not used, removing, as well as add_packages_to_errata_cb.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 5334669..7b25671 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -322,9 +322,6 @@ sub default_callback {
elsif ($label eq 'remove_packages_from_errata') {
return remove_packages_from_errata_cb($pxt);
}
- elsif ($label eq 'add_packages_to_errata') {
- return add_packages_to_errata_cb($pxt);
- }
elsif ($label eq 'sync_packages_to_channel') {
return sync_packages_to_channel_cb($pxt);
}
@@ -2350,41 +2347,6 @@ sub remove_packages_from_errata_cb {
return 1;
}
-sub add_packages_to_errata_cb {
- my $pxt = shift;
-
- my $set_label = $pxt->dirty_param('set_label');
- throw "No package set label" unless $set_label;
-
- my $eid = $pxt->param('eid');
- my $errata = RHN::ErrataTmp->lookup_managed_errata(-id => $eid);
-
- $errata->add_packages_in_set(-set_label => $set_label, -user_id => $pxt->user->id);
-
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my $count = scalar $package_set->contents;
- $package_set->empty;
- $package_set->commit;
-
- unless ($errata->isa('RHN::DB::ErrataTmp')) {
- foreach my $cid (RHN::Errata->channels($eid)) {
- RHN::ChannelEditor->schedule_errata_cache_update($pxt->user->org_id, $cid, 3600);
- }
-
- my $package_list_edited = $pxt->session->get('errata_package_list_edited') || { };
- $package_list_edited->{$eid} = time;
- $pxt->session->set(errata_package_list_edited => $package_list_edited);
- }
-
- $errata->refresh_erratafiles;
-
- $pxt->push_message(site_info => sprintf("<strong>%d</strong> package%s added to errata <strong>%s</strong>.",
- $count, $count == 1 ? '' : 's',
- $errata->advisory));
-
- return 1;
-}
-
sub datasource_result_into_manifest {
my $data = shift;
my $org_id = shift;
commit bf39a3eca973f56fc7e4af0b4275d65f323971d3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 13:45:20 2009 +0100
Previous removals make element_count not used, removing.
diff --git a/web/modules/rhn/RHN/DB/Set.pm b/web/modules/rhn/RHN/DB/Set.pm
index df475b2..801e751 100644
--- a/web/modules/rhn/RHN/DB/Set.pm
+++ b/web/modules/rhn/RHN/DB/Set.pm
@@ -70,10 +70,6 @@ sub contains {
return exists $self->{contents}->{$val};
}
-sub element_count {
- return scalar keys %{$_[0]->{contents}};
-}
-
sub empty {
$_[0]->{contents} = { };
}
commit d74ce0d6c9cc2030c611024ad2965811e9087c5b
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 13:44:42 2009 +0100
download_packages not used anywhere, removing as dead code.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index 1f4c1bd..5334669 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -301,17 +301,6 @@ sub default_callback {
elsif ($label eq 'package_remove_remote_command') {
return package_remove_remote_command_cb($pxt);
}
- elsif ($label eq 'download_packages') {
- my $set_label = $pxt->dirty_param('list_set_label');
- my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
-
- if ($set->element_count > PXT::Config->get('download_tarball_max')) {
- $pxt->push_message(site_info =>sprintf("At most %d packages may be downloaded as a tarball at one time; please reduce your selection size",
- PXT::Config->get('download_tarball_max')));
- return 0;
- }
- return 1;
- }
elsif ($label eq 'update_channel_packages_from_errata') {
return add_channel_packages_cb($pxt);
}
commit 52fbec5a245ee67862fd613926c4673de6dfdcc7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Dec 18 13:40:30 2009 +0100
Removal of download_packages.pxt makes download_system_packages and package_download_for_system_cb not used, removing.
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index dc3e3a2..1f4c1bd 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -301,23 +301,6 @@ sub default_callback {
elsif ($label eq 'package_remove_remote_command') {
return package_remove_remote_command_cb($pxt);
}
- elsif ($label eq 'download_system_packages') {
- my $set_label = $pxt->dirty_param('set_label');
- my $package_set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my $download_set = RHN::Set->lookup(-label => 'package_downloadable_list', -uid => $pxt->user->id);
-
- $download_set->empty;
- $download_set->add($package_set->contents);
- $download_set->commit;
-
- if ($download_set->element_count > PXT::Config->get('download_tarball_max')) {
- $pxt->push_message(site_info =>sprintf("At most %d packages may be downloaded as a tarball at one time; please reduce your selection size",
- PXT::Config->get('download_tarball_max')));
- return 0;
- }
-
- return 1;
- }
elsif ($label eq 'download_packages') {
my $set_label = $pxt->dirty_param('list_set_label');
my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
@@ -353,9 +336,6 @@ sub default_callback {
elsif ($label eq 'add_packages_to_errata') {
return add_packages_to_errata_cb($pxt);
}
- elsif ($label eq 'download_system_packages') {
- return package_download_for_system_cb($pxt);
- }
elsif ($label eq 'sync_packages_to_channel') {
return sync_packages_to_channel_cb($pxt);
}
@@ -1209,35 +1189,6 @@ sub package_download_for_system_arch_select_provider {
alphabar => $alphabar);
}
-sub package_download_for_system_cb {
- my $pxt = shift;
- my $set_label = shift || 'downloadable_package_list';
-
- my $set = RHN::Set->lookup(-label => $set_label, -uid => $pxt->user->id);
- my @files = $pxt->dirty_param('download_packages');
- my @optional_files = $pxt->dirty_param('optional_pacakges');
-
- my @selected_pids = $set->contents;
- my @selected_files;
- my $prefix = '/pub/';
-
- foreach my $pid (@selected_pids) {
- my $package = RHN::Package->lookup(-id => $pid);
- push @selected_files, $prefix . $package->path;
- }
-
- my $all_files = join("&", (map { 'filename_full=' . PXT::Utils->escapeURI($_) } @files, @optional_files));
- my $selected_files = join("&", (map { 'filename=' . PXT::Utils->escapeURI($_) } @files, @selected_files));
-
- my $token = $pxt->dirty_param('token');
-
- my $vars = sprintf('token=%s&%s&%s', $token, $all_files, $selected_files);
-
- my $uri = '/cgi-bin/download.pl?' . $vars;
-
- $pxt->redirect($uri);
-}
-
sub delete_packages_cb {
my $pxt = shift;
my $set_label = shift || 'deletable_package_list';
14 years, 4 months
- 1
- 0
Changes to 'refs/tags/spacewalk-java-0.8.4-1'
by Tomas Lestach
Tag 'spacewalk-java-0.8.4-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2009-12-18 14:46 +0000
Tagging package [spacewalk-java] version [0.8.4-1] in directory [java/].
Changes since yum-rhn-plugin-0.8.1-1:
Tomas Lestach (6):
displaying checkum type on rhn/software/packages/Details.do page
adding checksum type for rhn/errata/details/Packages.do page
sha256 changes for taskomatic
modifying Checksum.toString() for easier debugging
fixed exception handling
Automatic commit of package [spacewalk-java] release [0.8.4-1].
---
java/code/src/com/redhat/rhn/domain/common/Checksum.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java | 19 ++----
java/code/src/com/redhat/rhn/taskomatic/task/repomd/PrimaryXmlWriter.java | 2
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 31 +++++++---
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 3
java/code/webapp/WEB-INF/pages/errata/erratapackages.jsp | 2
java/code/webapp/WEB-INF/pages/rhnpackage/packagedetail.jsp | 8 +-
java/spacewalk-java.spec | 19 +++++-
rel-eng/packages/spacewalk-java | 2
9 files changed, 59 insertions(+), 29 deletions(-)
---
14 years, 4 months
- 1
- 0
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 19 ++++++++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 19 insertions(+), 2 deletions(-)
New commits:
commit 5e535109375fcd7799c24cc31b19c88a71409b37
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 18 15:46:26 2009 +0100
Automatic commit of package [spacewalk-java] release [0.8.4-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 2026ea9..71c85b9 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.8.3
+Version: 0.8.4
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -283,6 +283,23 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Dec 18 2009 Tomas Lestach <tlestach(a)redhat.com> 0.8.4-1
+- fixed exception handling (tlestach(a)redhat.com)
+- modifying Checksum.toString() for easier debugging (tlestach(a)redhat.com)
+- sha256 changes for taskomatic (tlestach(a)redhat.com)
+- adding checksum type for rhn/errata/details/Packages.do page
+ (tlestach(a)redhat.com)
+- displaying checkum type on rhn/software/packages/Details.do page
+ (tlestach(a)redhat.com)
+- download_packages.pxt was in the second rhn-tab-url in both
+ channel_detail.xmls, and not referenced from anywhere else, removing.
+ (jpazdziora(a)redhat.com)
+- The webapp.conf is not used anywhere. (jpazdziora(a)redhat.com)
+- adding channel.software.regenerateYumCache() api call (jsherril(a)redhat.com)
+- making selinux not required for server.config.createOrUpdate() api call, also
+ adding selinux_ctx to the documentation (jsherril(a)redhat.com)
+- changing mock request to default to a POST request (jsherril(a)redhat.com)
+
* Wed Dec 16 2009 Tomas Lestach <tlestach(a)redhat.com> 0.8.3-1
- modifying spacewalk-java build propetries to enable f12 builds
(tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bcf8e3c..89c4417 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.8.3-1 java/
+0.8.4-1 java/
14 years, 4 months
- 1
- 0
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java | 13 +++-------
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 9 ++++++
2 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit c708534e885f7547bd3c076efbd328b1df998bb4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 18 15:11:01 2009 +0100
fixed exception handling
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
index aa1319d..a117a97 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
@@ -41,21 +41,16 @@ public class CompressingDigestOutputWriter extends OutputStream implements
*
* @param stream The stream to compress
* @param checksumAlgo checksum algorithm
+ * @throws NoSuchAlgorithmException nosuchalgorithmexception
+ * @throws IOException ioexception
*/
- public CompressingDigestOutputWriter(OutputStream stream, String checksumAlgo) {
- try {
+ public CompressingDigestOutputWriter(OutputStream stream, String checksumAlgo)
+ throws NoSuchAlgorithmException, IOException {
compressedDigestStream = new DigestOutputStream(stream,
MessageDigest.getInstance(checksumAlgo));
compressedStream = new GZIPOutputStream(compressedDigestStream);
uncompressedDigestStream = new DigestOutputStream(compressedStream,
MessageDigest.getInstance(checksumAlgo));
- }
- catch (NoSuchAlgorithmException nsae) {
- // XXX fatal runtime exception
- }
- catch (IOException ioe) {
- // XXX fatal runtime exception
- }
}
/**
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index f896942..9b52cd5 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -126,6 +126,9 @@ public class RepositoryWriter {
catch (IOException e) {
throw new RepomdRuntimeException(e);
}
+ catch (NoSuchAlgorithmException e) {
+ throw new RepomdRuntimeException(e);
+ }
BufferedWriter primaryBufferedWriter = new BufferedWriter(
new OutputStreamWriter(primaryFile));
@@ -366,6 +369,12 @@ public class RepositoryWriter {
catch (FileNotFoundException e) {
throw new RepomdRuntimeException(e);
}
+ catch (NoSuchAlgorithmException e) {
+ throw new RepomdRuntimeException(e);
+ }
+ catch (IOException e) {
+ throw new RepomdRuntimeException(e);
+ }
BufferedWriter updateinfoBufferedWriter = new BufferedWriter(
new OutputStreamWriter(updateinfoFile));
UpdateInfoWriter updateinfo = new UpdateInfoWriter(
14 years, 4 months
- 1
- 0
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/common/Checksum.java | 2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java | 2 -
java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java | 17 +++++-----
java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java | 3 +
4 files changed, 13 insertions(+), 11 deletions(-)
New commits:
commit b6dd3f18b04e07bdcc3580cfdba5800f2020c67f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Dec 18 14:18:49 2009 +0100
modifying Checksum.toString() for easier debugging
+ checkstyle fixes
diff --git a/java/code/src/com/redhat/rhn/domain/common/Checksum.java b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
index fdbed65..9d8ca14 100644
--- a/java/code/src/com/redhat/rhn/domain/common/Checksum.java
+++ b/java/code/src/com/redhat/rhn/domain/common/Checksum.java
@@ -94,6 +94,6 @@ public class Checksum extends BaseDomainHelper {
/** {@inheritDoc} */
public String toString() {
- return checksum;
+ return checksumType + ":" + checksum;
}
}
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
index 1055480..aa1319d 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/CompressingDigestOutputWriter.java
@@ -40,7 +40,7 @@ public class CompressingDigestOutputWriter extends OutputStream implements
/**
*
* @param stream The stream to compress
- * @param checksumtype checksum type
+ * @param checksumAlgo checksum algorithm
*/
public CompressingDigestOutputWriter(OutputStream stream, String checksumAlgo) {
try {
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
index dab4af4..f896942 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/RepositoryWriter.java
@@ -109,18 +109,19 @@ public class RepositoryWriter {
log.info("Checksum Type Value" + this.checksumtype);
// available digests: MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
- String checksum_algo = this.checksumtype;
- if (checksum_algo.toUpperCase().startsWith("SHA")) {
- checksum_algo = this.checksumtype.substring(0, 3) + "-" + this.checksumtype.substring(3);
+ String checksumAlgo = this.checksumtype;
+ if (checksumAlgo.toUpperCase().startsWith("SHA")) {
+ checksumAlgo = this.checksumtype.substring(0, 3) + "-" +
+ this.checksumtype.substring(3);
}
try {
primaryFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + PRIMARY_FILE), checksum_algo);
+ new FileOutputStream(prefix + PRIMARY_FILE), checksumAlgo);
filelistsFile = new CompressingDigestOutputWriter(
- new FileOutputStream(prefix + FILELISTS_FILE), checksum_algo);
+ new FileOutputStream(prefix + FILELISTS_FILE), checksumAlgo);
otherFile = new CompressingDigestOutputWriter(new FileOutputStream(
- prefix + OTHER_FILE), checksum_algo);
+ prefix + OTHER_FILE), checksumAlgo);
}
catch (IOException e) {
throw new RepomdRuntimeException(e);
@@ -187,9 +188,9 @@ public class RepositoryWriter {
'"');
log.info("Checksum Type Value for generate updateinfo" + this.checksumtype);
RepomdIndexData updateinfoData = generateUpdateinfo(channel, prefix,
- checksum_algo);
+ checksumAlgo);
- RepomdIndexData groupsData = loadCompsFile(channel, checksum_algo);
+ RepomdIndexData groupsData = loadCompsFile(channel, checksumAlgo);
//Set the type so yum can read and perform checksum
primaryData.setType(this.checksumtype);
diff --git a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
index 966720e..cf11c47 100644
--- a/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
+++ b/java/code/src/com/redhat/rhn/taskomatic/task/repomd/UpdateInfoWriter.java
@@ -179,7 +179,8 @@ public class UpdateInfoWriter extends RepomdWriter {
pkg.getFilename()));
attr.clear();
- attr.addAttribute("type", sanitize(pkgId, pkg.getChecksum().getChecksumType().getLabel()));
+ attr.addAttribute("type",
+ sanitize(pkgId, pkg.getChecksum().getChecksumType().getLabel()));
handler.startElement("sum", attr);
handler.addCharacters(sanitize(pkgId, pkg.getChecksum().getChecksum()));
handler.endElement("sum");
14 years, 4 months
- 1
- 0