aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-08 09:10:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-08 09:10:02 +0000
commitb6ac88e612b292fbf52ce67fe844d1f5c33fdff5 (patch)
tree3925a8f89c5c3fc9544e7291c3e387150ec65142 /URPM
parente78fb45b5092a41bd800e7dadcc7c268967c0f4d (diff)
downloadperl-URPM-b6ac88e612b292fbf52ce67fe844d1f5c33fdff5.tar
perl-URPM-b6ac88e612b292fbf52ce67fe844d1f5c33fdff5.tar.gz
perl-URPM-b6ac88e612b292fbf52ce67fe844d1f5c33fdff5.tar.bz2
perl-URPM-b6ac88e612b292fbf52ce67fe844d1f5c33fdff5.tar.xz
perl-URPM-b6ac88e612b292fbf52ce67fe844d1f5c33fdff5.zip
rename local var for clarity
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm12
1 files changed, 6 insertions, 6 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 10ae90d..4572b90 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -259,12 +259,12 @@ sub unsatisfied_requires {
#- all requires should be satisfied according to selected packages or installed packages,
#- or the package itself.
- REQUIRES: foreach my $dep ($pkg->requires) {
- my ($n, $s) = property2name_range($dep) or next;
+ REQUIRES: foreach my $prop ($pkg->requires) {
+ my ($n, $s) = property2name_range($prop) or next;
if (defined $options{name} && $n ne $options{name}) {
#- allow filtering on a given name (to speed up some search).
- } elsif (exists $unsatisfied{$dep}) {
+ } elsif (exists $unsatisfied{$prop}) {
#- avoid recomputing the same all the time.
} else {
#- check for installed packages in the installed cache.
@@ -276,11 +276,11 @@ sub unsatisfied_requires {
#- check on the selected package if a provide is satisfying the resolution (need to do the ops).
foreach (grep { exists $state->{selected}{$_} } keys %{$urpm->{provides}{$n} || {}}) {
my $p = $urpm->{depslist}[$_];
- !$urpm->{provides}{$n}{$_} || $p->provides_overlap($dep, 1) and next REQUIRES;
+ !$urpm->{provides}{$n}{$_} || $p->provides_overlap($prop, 1) and next REQUIRES;
}
#- check if the package itself provides what is necessary.
- $pkg->provides_overlap($dep) and next REQUIRES;
+ $pkg->provides_overlap($prop) and next REQUIRES;
#- check on installed system if a package which is not obsoleted is satisfying the require.
my $satisfied = 0;
@@ -305,7 +305,7 @@ sub unsatisfied_requires {
});
}
#- if nothing can be done, the require should be resolved.
- $satisfied or $unsatisfied{$dep} = undef;
+ $satisfied or $unsatisfied{$prop} = undef;
}
}