From 2a4b466fd8518a62afe7a1b11fe26f788b08bc2a Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Thu, 28 Jun 2012 20:58:59 +0000 Subject: (find_packages_to_remove) simplify (needs URPM >= 4.10) --- urpm/select.pm | 41 +---------------------------------------- 1 file changed, 1 insertion(+), 40 deletions(-) (limited to 'urpm/select.pm') diff --git a/urpm/select.pm b/urpm/select.pm index 9c5a95ce..d79785b1 100644 --- a/urpm/select.pm +++ b/urpm/select.pm @@ -408,46 +408,7 @@ sub find_packages_to_remove { foreach (@$l) { my ($n, $found); - #- check if name-version-release.architecture was given. - if (($n) = $_ =~ $fullname2name_re) { - $db->traverse_tag('name', [ $n ], sub { - my ($p) = @_; - $p->fullname eq $_ or return; - $urpm->resolve_rejected($db, $state, $p, removed => 1); - push @m, scalar $p->fullname; - $found = 1; - }); - $found and next; - } - - #- check if name-version-release was given. - if (($n) = /^(.*)-[^\-]*-[^\-]*$/) { - $db->traverse_tag('name', [ $n ], sub { - my ($p) = @_; - my ($name, $version, $release) = $p->fullname; - "$name-$version-$release" eq $_ or return; - $urpm->resolve_rejected($db, $state, $p, removed => 1); - push @m, scalar $p->fullname; - $found = 1; - }); - $found and next; - } - - #- check if name-version was given. - if (($n) = /^(.*)-[^\-]*$/) { - $db->traverse_tag('name', [ $n ], sub { - my ($p) = @_; - my ($name, $version) = $p->fullname; - "$name-$version" eq $_ or return; - $urpm->resolve_rejected($db, $state, $p, removed => 1); - push @m, scalar $p->fullname; - $found = 1; - }); - $found and next; - } - - #- check if only name was given. - $db->traverse_tag('name', [ $_ ], sub { + $db->traverse_tag('nvra', [ $_ ], sub { my ($p) = @_; $urpm->resolve_rejected($db, $state, $p, removed => 1); push @m, scalar $p->fullname; -- cgit v1.2.1