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';