From 94262f00fc4b653bf284d2bc2a54caee69187717 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 4 Mar 2008 21:48:54 +0000 Subject: cleanup --- urpm/select.pm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'urpm') diff --git a/urpm/select.pm b/urpm/select.pm index 5f5632a1..b5292c95 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -7,13 +7,11 @@ use urpm::util; use urpm::sys; use URPM; -my $default_list = 'rpm,perl-URPM,perl-MDV-Distribconf,urpmi,meta-task,glibc'; +my $default_priority_list = 'rpm,perl-URPM,perl-MDV-Distribconf,urpmi,meta-task,glibc'; +my @priority_list = split(',', $default_priority_list); sub add_packages_to_priority_upgrade_list { - my (@packages) = @_; - @packages = grep { $default_list !~ /,$_\b/ } @packages; - return if !@packages; - $default_list .= join(',', '', @packages); + @priority_list = uniq(@priority_list, @_); } sub set_priority_upgrade_option { @@ -23,7 +21,7 @@ sub set_priority_upgrade_option { # comma-separated list of packages that should be installed first, # and that trigger an urpmi restart - my $list = $default_list; + my $list = join(',', @priority_list); if ($previous) { if ($previous eq $list) { $list = ''; -- cgit v1.2.1