- 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

2 files changed, 9 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index e315233..25a87e6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,7 @@
 - fix bug occurring with --keep
+- 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}
 
 Version 2.00 - 13 September 2007, by Pascal "Pixel" Rigaux
 
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) {