From 6e0d3e00411d0c482814439a0fcd5a9b5089df0a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Tue, 26 Aug 2008 15:11:40 +0000
Subject: (readconf) make --mode option work again

---
 Rpmdrake/init.pm | 1 +
 rpmdrake.pm      | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Rpmdrake/init.pm b/Rpmdrake/init.pm
index 6060ee60..a7c5e059 100644
--- a/Rpmdrake/init.pm
+++ b/Rpmdrake/init.pm
@@ -126,6 +126,7 @@ foreach my $option (qw(media mode parallel rpm-root search)) {
 }
 
 our $MODE = ref $rpmdrake_options{mode} ? $rpmdrake_options{mode}[0] : undef;
+our $overriding_config = defined $MODE;
 unless ($MODE) {
     $MODE = 'install';
     $0 =~ m|remove$|  and $MODE = 'remove';
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 0870c632..0c8f5835 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -184,7 +184,7 @@ sub readconf() {
     }
     # special cases:
     $::rpmdrake_options{'no-confirmation'} = $no_confirmation->[0] if !defined $::rpmdrake_options{'no-confirmation'};
-    $Rpmdrake::init::default_list_mode = $tree_mode->[0] if ref $tree_mode;
+    $Rpmdrake::init::default_list_mode = $tree_mode->[0] if ref $tree_mode && !$Rpmdrake::init::overriding_config;
 }
 
 sub writeconf() {
-- 
cgit v1.2.1