added missing fix on bad conflicts listing,

removed stderr logs.

1 files changed, 1 insertions, 3 deletions

diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 6a4f104..2ced98b 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -255,7 +255,6 @@ sub backtrack_selected {
 		  $state->{rejected}{$_->fullname}{backtrack}{closure}{$dep->{from}->fullname} = undef;
 	    }
 	}
-	print STDERR "+++".$urpm->{depslist}[$dep->{required}]->fullname."\n";
 	#- the package is already rejected, we assume we can add another reason here!
 	push @{$state->{rejected}{$dep->{from}->fullname}{backtrack}{unsatisfied}}, $dep->{required};
     }
@@ -366,7 +365,6 @@ sub resolve_requested {
     #- package present or by a new package to upgrade), then requires not satisfied and
     #- finally conflicts that will force a new upgrade or a remove.
     while (defined ($dep = shift @properties)) {
-	print STDERR ">>required=$dep->{required}<< >>requested=$dep->{requested}<< >>from=".eval{$dep->{from}->fullname.""}."\n";
 	#- in case of keep_unrequested_dependencies option is not set, we need to avoid
 	#- selecting packages if the source has been disabled.
 	if (exists $dep->{from} && !$options{keep_unrequested_dependencies}) {
@@ -590,7 +588,7 @@ sub resolve_requested {
 					      #- no package have been found, we need to remove the package examined.
 					      $urpm->resolve_rejected($db, $state, $p,
 								      removed => 1, unsatisfied => \@properties,
-								      from => scalar $pkg->fullname, why => { conflicts => $property });
+								      from => scalar $pkg->fullname, why => { conflicts => scalar $pkg->fullname });
 					  }
 				      }
 				  });