aboutsummaryrefslogtreecommitdiffstats
path: root/URPM
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-14 14:34:42 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-14 14:34:42 +0000
commit2ad10e21d48887d09e29c2d56445a669ef4c9613 (patch)
treed687076c01a52353987042d7080ab61874217a18 /URPM
parente18a8d94560ced45d81c84d302843e8de04e7465 (diff)
downloadperl-URPM-2ad10e21d48887d09e29c2d56445a669ef4c9613.tar
perl-URPM-2ad10e21d48887d09e29c2d56445a669ef4c9613.tar.gz
perl-URPM-2ad10e21d48887d09e29c2d56445a669ef4c9613.tar.bz2
perl-URPM-2ad10e21d48887d09e29c2d56445a669ef4c9613.tar.xz
perl-URPM-2ad10e21d48887d09e29c2d56445a669ef4c9613.zip
- fix regression in 2.00: keep_unrequested_dependencies is still used by
installer. restore it, but must now be set trough $urpm->{keep_unrequested_dependencies} - add some more debug info
Diffstat (limited to 'URPM')
-rw-r--r--URPM/Resolve.pm7
1 files changed, 6 insertions, 1 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index cca9a2d..e20c66e 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -738,7 +738,7 @@ sub resolve_requested__no_suggests_ {
do {
while (my $dep = shift @properties) {
#- we need to avoid selecting packages if the source has been disabled.
- if (exists $dep->{from}) {
+ if (exists $dep->{from} && !$urpm->{keep_unrequested_dependencies}) {
exists $state->{selected}{$dep->{from}->id} or next;
}
@@ -1155,6 +1155,7 @@ sub disable_selected {
}
#- the package being examined has to be unselected.
+ $urpm->{debug_URPM}("unselecting " . $pkg->fullname) if $urpm->{debug_URPM};
$pkg->set_flag_requested(0);
$pkg->set_flag_required(0);
delete $state->{selected}{$pkg->id};
@@ -1199,6 +1200,10 @@ sub disable_selected_and_unrequested_dependencies {
#- keep in the packages that had to be unselected.
@all_unselected or push @all_unselected, @unselected;
+ if ($urpm->{keep_unrequested_dependencies}) {
+ last;
+ }
+
#- search for unrequested required packages.
foreach (@unselected) {
foreach ($_->requires_nosense) {