From 8b2ae9bf536f6eafbb7523543b9039813208c55f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 11 Sep 2008 15:21:23 +0000
Subject: - do display conflicting packages instead of silently removing them  
 (needs urpmi 6.11) (#43501)

---
 NEWS            | 3 +++
 Rpmdrake/gui.pm | 8 ++++++++
 2 files changed, 11 insertions(+)

diff --git a/NEWS b/NEWS
index b454c435..f901421a 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- do display conflicting packages instead of silently removing them
+  (needs urpmi 6.11) (#43501)
+
 Version 4.18.2 - 10 September 2008, Thierry Vignaud
 
 - fix opening the right RPM DB with --env
diff --git a/Rpmdrake/gui.pm b/Rpmdrake/gui.pm
index c966898b..da151920 100644
--- a/Rpmdrake/gui.pm
+++ b/Rpmdrake/gui.pm
@@ -696,6 +696,14 @@ sub toggle_nodes {
                 goto packages_selection_ok;
             }
 
+	    if (my $conflicting_msg = urpm::select::conflicting_packages_msg($urpm, $urpm->{state})) {
+                if (!interactive_msg('', $conflicting_msg, yesno => 1)) {
+		    @nodes_with_deps = ();
+		    $urpm->disable_selected(open_rpm_db(), $urpm->{state}, @requested);
+		    goto packages_selection_ok;
+		}
+	    }
+
             if (my @cant = sort(difference2(\@nodes, \@nodes_with_deps))) {
                 my @ask_unselect = urpm::select::unselected_packages($urpm, $urpm->{state});
                 my @reasons = map {
-- 
cgit v1.2.1