summaryrefslogtreecommitdiffstats
path: root/urpm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-13 07:40:52 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-13 07:40:52 +0000
commita875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b (patch)
treee5b1ee0a8058c6a99929dfa86b805b45e802c4ee /urpm
parent04eedcd53a50cb3d602a76d5888a49b51f3e84e3 (diff)
downloadurpmi-a875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b.tar
urpmi-a875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b.tar.gz
urpmi-a875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b.tar.bz2
urpmi-a875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b.tar.xz
urpmi-a875cfd4bba2c24d68cb37bd7fbdbd8ca7a7157b.zip
reverting commit (13 March 2006):
"Passing bundle option, even if that does nothing for now" since it does nothing. will revert if/when support is really implemented
Diffstat (limited to 'urpm')
-rw-r--r--urpm/args.pm1
-rw-r--r--urpm/select.pm11
2 files changed, 5 insertions, 7 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) . "]");