diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-09-20 18:39:59 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-09-20 18:39:59 +0000 |
| commit | 80028325730760ee817b75eb3b5c2c67aaa089b3 (patch) | |
| tree | 83583b369de40b6f41d558bbe813d9070f8998ce /URPM/Resolve.pm | |
| parent | 90eee80969aa54b3bc610338e0c9449e5dfef51f (diff) | |
| download | perl-URPM-80028325730760ee817b75eb3b5c2c67aaa089b3.tar perl-URPM-80028325730760ee817b75eb3b5c2c67aaa089b3.tar.gz perl-URPM-80028325730760ee817b75eb3b5c2c67aaa089b3.tar.bz2 perl-URPM-80028325730760ee817b75eb3b5c2c67aaa089b3.tar.xz perl-URPM-80028325730760ee817b75eb3b5c2c67aaa089b3.zip | |
perl_checker cleanups
Diffstat (limited to 'URPM/Resolve.pm')
| -rw-r--r-- | URPM/Resolve.pm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 7e8aaf2..03d7657 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -546,8 +546,8 @@ sub with_state_unsatisfied_requires { sub with_any_unsatisfied_requires { my ($urpm, $db, $state, $name, $do) = @_; - with_db_unsatisfied_requires($urpm, $db, $state, $name, sub { my ($p, @l) = @_; $do->($p, 0, @l)}); - with_state_unsatisfied_requires($urpm, $db, $state, $name, sub { my ($p, @l) = @_; $do->($p, 1, @l)}); + with_db_unsatisfied_requires($urpm, $db, $state, $name, sub { my ($p, @l) = @_; $do->($p, 0, @l) }); + with_state_unsatisfied_requires($urpm, $db, $state, $name, sub { my ($p, @l) = @_; $do->($p, 1, @l) }); } @@ -580,7 +580,7 @@ sub backtrack_selected { my $closure = $state->{rejected}{$_->fullname}{closure} || {}; foreach my $p (grep { exists $closure->{$_}{avoid} } keys %$closure) { - _add_rejected_backtrack($state, $_, { conflicts => [ $p ] }) + _add_rejected_backtrack($state, $_, { conflicts => [ $p ] }); } #- backtrack callback should return a strictly positive value if the selection of the new #- package is prefered over the currently selected package. @@ -1058,7 +1058,7 @@ sub resolve_requested__no_suggests_ { sub _handle_conflicts_with_selected { my ($urpm, $db, $state, $pkg, $dep, $properties, $diff_provides, %options) = @_; foreach ($pkg->conflicts) { - if (my ($n, $o, $v) = property2name_op_version($_)) { + if (my ($n, $_o, $_v) = property2name_op_version($_)) { foreach my $p ($urpm->packages_providing($n)) { $pkg == $p and next; $p->provides_overlap($_) or next; @@ -1254,7 +1254,7 @@ sub _handle_diff_provides { @packages = grep { ($_->name eq $p->name ? $p->compare_pkg($_) < 0 : $_->obsoletes_overlap($p->name . " == " . $p->epoch . ":" . $p->version . "-" . $p->release)) - && (!strict_arch($urpm) || strict_arch_check($p, $_)) + && (!strict_arch($urpm) || strict_arch_check($p, $_)); } @packages; if (!@packages) { |