aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--URPM/Resolve.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 138ce55..739ecaf 100644
--- a/NEWS
+++ b/NEWS
@@ -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) {