diff options
| author | Francois Pons <fpons@mandriva.com> | 2003-06-18 17:02:18 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2003-06-18 17:02:18 +0000 |
| commit | ccac87c3c2131730bb7c11b2f651d36784ee14c4 (patch) | |
| tree | 02e5b02a89ae99b03018f5c039d6f6c481adb8e4 | |
| parent | cd24c7bdba62608307820ce53d7ab218f6c85929 (diff) | |
| download | perl-URPM-ccac87c3c2131730bb7c11b2f651d36784ee14c4.tar perl-URPM-ccac87c3c2131730bb7c11b2f651d36784ee14c4.tar.gz perl-URPM-ccac87c3c2131730bb7c11b2f651d36784ee14c4.tar.bz2 perl-URPM-ccac87c3c2131730bb7c11b2f651d36784ee14c4.tar.xz perl-URPM-ccac87c3c2131730bb7c11b2f651d36784ee14c4.zip | |
added missing fix on bad conflicts listing,
removed stderr logs.
| -rw-r--r-- | URPM/Resolve.pm | 4 | ||||
| -rw-r--r-- | perl-URPM.spec | 1 |
2 files changed, 2 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 }); } } }); diff --git a/perl-URPM.spec b/perl-URPM.spec index 626401b..503ad5d 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -55,6 +55,7 @@ rm -rf $RPM_BUILD_ROOT - fixed installation of old package due to missing closure. - fixed nodeps option to used for building transaction set. - fixed too many from source propagated which were not legal. +- fixed bad conflicts listing. * Wed Jun 18 2003 François Pons <fpons@mandrakesoft.com> 0.91-3mdk - fixed obssoletes on virtual provides not taken into account. |