summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--urpm/args.pm1
-rw-r--r--urpm/select.pm11
-rw-r--r--urpme3
3 files changed, 6 insertions, 9 deletions
diff --git a/urpm/args.pm b/urpm/args.pm
index b0d29aa1..cb4d0e9f 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -169,7 +169,6 @@ my %options_spec = (
noscripts => \$::noscripts,
repackage => \$::repackage,
restricted => \$::restricted,
- 'bundle!' => sub { $::bundle = $_[1] },
},
#- see also below, autogenerated callbacks
diff --git a/urpm/select.pm b/urpm/select.pm
index 7f234925..8f6c8f3f 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -323,7 +323,6 @@ sub get_preferred {
#- find packages to remove.
#- options:
-#- bundle
#- callback_base
#- callback_fuzzy
#- callback_notfound
@@ -349,7 +348,7 @@ sub find_packages_to_remove {
$db->traverse_tag('name', [ $n ], sub {
my ($p) = @_;
$p->fullname eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
+ $urpm->resolve_rejected($db, $state, $p, removed => 1);
push @m, scalar $p->fullname;
$found = 1;
});
@@ -362,7 +361,7 @@ sub find_packages_to_remove {
my ($p) = @_;
my ($name, $version, $release) = $p->fullname;
"$name-$version-$release" eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
+ $urpm->resolve_rejected($db, $state, $p, removed => 1);
push @m, scalar $p->fullname;
$found = 1;
});
@@ -375,7 +374,7 @@ sub find_packages_to_remove {
my ($p) = @_;
my ($name, $version) = $p->fullname;
"$name-$version" eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
+ $urpm->resolve_rejected($db, $state, $p, removed => 1);
push @m, scalar $p->fullname;
$found = 1;
});
@@ -386,7 +385,7 @@ sub find_packages_to_remove {
$db->traverse_tag('name', [ $_ ], sub {
my ($p) = @_;
$p->name eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
+ $urpm->resolve_rejected($db, $state, $p, removed => 1);
push @m, scalar $p->fullname;
$found = 1;
});
@@ -413,7 +412,7 @@ sub find_packages_to_remove {
my ($p) = @_;
my $f = scalar $p->fullname;
$f =~ $qmatch or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
+ $urpm->resolve_rejected($db, $state, $p, removed => 1);
push @m, $f;
});
$urpm->{log}("...done, packages found [" . join(' ', @m) . "]");
diff --git a/urpme b/urpme
index da13149d..e848870a 100644
--- a/urpme
+++ b/urpme
@@ -31,7 +31,7 @@ use urpm::select;
$ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
-our ($test, $parallel, $auto, $matches, $force, $noscripts, $repackage, @l, $bundle, $restricted);
+our ($test, $parallel, $auto, $matches, $force, $noscripts, $repackage, @l, $restricted);
my $yesexpr =
#-PO: Add here the keys which might be pressed in the "Yes"-case.
N("Yy");
@@ -97,7 +97,6 @@ my @toremove = urpm::select::find_packages_to_remove($urpm,
\@l,
matches => $matches,
force => $force,
- bundle => $bundle,
callback_notfound => sub {
my $urpm = shift @_;
#- Warning : the following message is parsed in urpm::parallel_*