aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm4
1 files changed, 1 insertions, 3 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 95b55ec..690d7c5 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -814,7 +814,6 @@ sub backtrack_selected {
}
}
- my @properties;
if (defined $dep->{psel}) {
if ($options{keep}) {
backtrack_selected_psel_keep($urpm, $db, $state, $dep->{psel}, $dep->{keep});
@@ -843,7 +842,6 @@ sub backtrack_selected {
#- some packages may have been removed because of selection of this one.
#- the rejected flags should have been cleaned by disable_selected above.
- @properties;
}
#- side-effects:
@@ -1309,7 +1307,7 @@ sub _handle_conflicts_with_selected {
$urpm->{debug_URPM}($pkg->fullname . " conflicts with already selected package " . $p->fullname) if $urpm->{debug_URPM};
_remove_all_rejected_from($state, $pkg);
_set_rejected_from($state, $pkg, $p);
- unshift @$properties, backtrack_selected($urpm, $db, $state, $dep, $diff_provides, %options);
+ backtrack_selected($urpm, $db, $state, $dep, $diff_provides, %options);
return;
}
_set_rejected_from($state, $p, $pkg);