aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-11 15:21:23 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-11 15:21:23 +0000
commit8b2ae9bf536f6eafbb7523543b9039813208c55f (patch)
treee3415d7841bcac4e43d8ae6f9fc9870d6fed6b1e
parent64bba7335bb6575d02dc4ce8a081e58f11b0fe50 (diff)
downloadrpmdrake-8b2ae9bf536f6eafbb7523543b9039813208c55f.tar
rpmdrake-8b2ae9bf536f6eafbb7523543b9039813208c55f.tar.gz
rpmdrake-8b2ae9bf536f6eafbb7523543b9039813208c55f.tar.bz2
rpmdrake-8b2ae9bf536f6eafbb7523543b9039813208c55f.tar.xz
rpmdrake-8b2ae9bf536f6eafbb7523543b9039813208c55f.zip
- do display conflicting packages instead of silently removing them
(needs urpmi 6.11) (#43501)
-rw-r--r--NEWS3
-rw-r--r--Rpmdrake/gui.pm8
2 files changed, 11 insertions, 0 deletions
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 {