diff options
Diffstat (limited to 'URPM/Resolve.pm')
| -rw-r--r-- | URPM/Resolve.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 3752215..805bb24 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -1214,7 +1214,7 @@ sub resolve_requested__no_recommends_ { } } - _handle_conflicts_with_selected($urpm, $db, $state, $pkg, $dep, \@properties, \@diff_provides, %options) or next; + _handle_conflicts_with_selected($urpm, $db, $state, $pkg, $dep, \@diff_provides, %options) or next; $urpm->{debug_URPM}("selecting " . $pkg->fullname) if $urpm->{debug_URPM}; @@ -1300,7 +1300,7 @@ sub resolve_requested__no_recommends_ { #- + those of _remove_all_rejected_from ($state->{rejected}) #- + those of backtrack_selected ($state->{backtrack}, $state->{rejected}, $state->{selected}, $state->{whatrequires}, flag_requested, flag_required) sub _handle_conflicts_with_selected { - my ($urpm, $db, $state, $pkg, $dep, $properties, $diff_provides, %options) = @_; + my ($urpm, $db, $state, $pkg, $dep, $diff_provides, %options) = @_; foreach ($pkg->conflicts) { if (my $n = property2name($_)) { foreach my $p ($urpm->packages_providing($n)) { |