aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-11-29 18:59:00 +0000
committerThierry Vignaud <tv@mandriva.org>2007-11-29 18:59:00 +0000
commitd36c42ad2235f89cac590831dc0824086cef05ac (patch)
tree69f0cc6963c6ce4757f7aa98a639604311ae7ad6
parentcddeac98613aa3164f60d1e52a07d3bfdb1b3998 (diff)
downloadrpmdrake-d36c42ad2235f89cac590831dc0824086cef05ac.tar
rpmdrake-d36c42ad2235f89cac590831dc0824086cef05ac.tar.gz
rpmdrake-d36c42ad2235f89cac590831dc0824086cef05ac.tar.bz2
rpmdrake-d36c42ad2235f89cac590831dc0824086cef05ac.tar.xz
rpmdrake-d36c42ad2235f89cac590831dc0824086cef05ac.zip
- 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)
-rw-r--r--Rpmdrake/init.pm4
-rw-r--r--Rpmdrake/pkg.pm12
2 files changed, 1 insertions, 15 deletions
diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm
index b37a30d2..df315bf3 100644
--- a/Rpmdrake/init.pm
+++ b/Rpmdrake/init.pm
@@ -47,8 +47,6 @@ N(" --no-confirmation don't ask first confirmation question in update mode
N(" --no-media-update don't update media at startup"),
N(" --no-verify-rpm don't verify packages signatures"),
if_($0 !~ /MandrivaUpdate/, N(" --parallel=alias,host be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps")),
-N(" --pkg-nosel=pkg1,.. show only these packages"),
-N(" --pkg-sel=pkg1,.. preselect these packages"),
N(" --rpm-root=path use another root for rpm installation"),
N(" --urpmi-root use another root for urpmi db & rpm installation"),
N(" --root force to run as root") . ' ' . N("(Deprecated)"),
@@ -103,7 +101,7 @@ foreach (@ARGV) {
}
}
-foreach my $option (qw(media mode parallel pkg-nosel pkg-sel rpm-root search)) {
+foreach my $option (qw(media mode parallel rpm-root search)) {
if (defined $rpmdrake_options{$option} && !ref($rpmdrake_options{$option})) {
warn "wrong usage of \"$option\" option!\n";
exit(-1); # too early for my_exit()
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;