From 9cdf4f302bcee100b4cd8492b0af1765772cc44b Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Fri, 19 Jul 2002 08:50:44 +0000
Subject: 0.11-1mdk

---
 URPM/Resolve.pm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'URPM')

diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 6c1400a..8aafd9e 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -317,6 +317,20 @@ sub resolve_requested {
 		}
 	    }
 	}
+
+	#- examine if an existing package does not conflicts with this one.
+	$db->traverse_tag('whatconflicts', [ $pkg->name ], sub {
+			     my ($p) = @_;
+			     foreach my $property ($p->conflicts) {
+				 if (grep { ranges_overlap($_, $property) } $pkg->provides) {
+				     $state->{conflicts}{$p->fullname}{$pkg->id} = undef;
+				     #- all these packages should be removed.
+				     $options{keep_state} or
+				       $urpm->resolve_closure_ask_remove($db, $state, $p,
+									 { conflicts => $property, pkg => $pkg });
+				 }
+			     }
+			 });
     }
 
     if ($options{keep_state}) {
-- 
cgit v1.2.1