From d36c42ad2235f89cac590831dc0824086cef05ac Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 29 Nov 2007 18:59:00 +0000 Subject: - drop --pkg-sel and --pkg-nosel broken options (introduced in rpmdrake-2.1.2-8mdk on Feb 26 2004 for MandrakeOnline which didn't use them since 2007.0) --- Rpmdrake/pkg.pm | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'Rpmdrake/pkg.pm') diff --git a/Rpmdrake/pkg.pm b/Rpmdrake/pkg.pm index ef3c6baa..c0ea5bad 100644 --- a/Rpmdrake/pkg.pm +++ b/Rpmdrake/pkg.pm @@ -362,8 +362,6 @@ sub get_pkgs { my @search_medias = grep { $_->{searchmedia} } @{$urpm->{media}}; my @backports; - my %pkg_sel = map { $_ => 1 } @{$::rpmdrake_options{'pkg-sel'} || []}; - my %pkg_nosel = map { $_ => 1 } @{$::rpmdrake_options{'pkg-nosel'} || []}; $reset_update->(1); foreach my $pkg (@{$urpm->{depslist}}) { $update->(); @@ -391,14 +389,8 @@ sub get_pkgs { my $name = urpm_name($pkg); if (member($name, @requested)) { - if ($::rpmdrake_options{'pkg-sel'} || $::rpmdrake_options{'pkg-nosel'}) { - my $n = $name; - $pkg_sel{$n} || $pkg_nosel{$n} or next; - $pkg_sel{$n} and $selected = 1; - } else { # selecting updates by default but skipped ones (MandrivaUpdate only): $selected = member($name, @requested_strict); - } push @updates, $name; } $all_pkgs{urpm_name($pkg)} = { selected => $selected, pkg => $pkg, @@ -406,10 +398,6 @@ sub get_pkgs { }; } } - if ($::rpmdrake_options{'pkg-sel'} && $::rpmdrake_options{'pkg-nosel'}) { - push @{$::rpmdrake_options{'pkg-nosel'}}, @{$::rpmdrake_options{'pkg-sel'}}; - delete $::rpmdrake_options{'pkg-sel'}; - } $all_pkgs{$_}{pkg}->set_flag_installed foreach @installed_pkgs; -- cgit v1.2.1