diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2008-02-25 13:33:49 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2008-02-25 13:33:49 +0000 |
| commit | b2be8342dea3fef9ac115d598a2e4fb30437e417 (patch) | |
| tree | 3701fc5d9eec0e32cb9fc8ddf2f26c3967fb655d | |
| parent | 4e307fe65c01822757ea97c257e238c7c031aab6 (diff) | |
| download | perl-URPM-b2be8342dea3fef9ac115d598a2e4fb30437e417.tar perl-URPM-b2be8342dea3fef9ac115d598a2e4fb30437e417.tar.gz perl-URPM-b2be8342dea3fef9ac115d598a2e4fb30437e417.tar.bz2 perl-URPM-b2be8342dea3fef9ac115d598a2e4fb30437e417.tar.xz perl-URPM-b2be8342dea3fef9ac115d598a2e4fb30437e417.zip | |
- handle new package providing xxx which conflicts with an installed package (#17106)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | URPM/Resolve.pm | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -1,3 +1,5 @@ +- handle new package providing xxx which conflicts with an installed package (#17106) + Version 3.08 - 25 February 2008, by Pascal "Pixel" Rigaux - sort choices on virtual package by provided version (#12645) diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 492a498..1f4006b 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -886,7 +886,7 @@ sub resolve_requested__no_suggests_ { _handle_conflicts($urpm, $db, $state, $pkg, \@properties, \%diff_provides_h, $options{keep} && \@keep); #- examine if an existing package does not conflict with this one. - $db->traverse_tag('whatconflicts', [ $pkg->name ], sub { + $db->traverse_tag('whatconflicts', [ $pkg->provides_nosense ], sub { @keep and return; my ($p) = @_; foreach my $property ($p->conflicts) { |