From c60ccd3efa3d24338ded284fcdf177c3fe8b76fb Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Sat, 20 Apr 2013 23:22:53 +0000
Subject: fix install dialog title (mga#9550)

rename a variable introduced by jvictor in commit r267936 on Apr 26 2010
("Added auto_select and clean_cache options to conf file") that badly
conflicted with urpmi's ::auto_select variable

we were lucky it didn't break more...
---
 NEWS        | 2 ++
 rpmdrake    | 4 ++--
 rpmdrake.pm | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 40b8c853..d703ff9f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix install dialog title (mga#9550)
+
 Version 5.46 - 26 Mar 2013, Thierry Vignaud
 
 - fix retrieving XML information (mga#9529)
diff --git a/rpmdrake b/rpmdrake
index ae853309..2ed87b97 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -576,7 +576,7 @@ sub run_treeview_dialog {
 	    [ $auto_select_string, undef, 
               sub {
                   my $box = $check_boxes{$auto_select_string};
-                  $auto_select->[0] = $box->get_active;
+                  $auto_select_opt->[0] = $box->get_active;
                   $::rpmdrake_options{auto} = $box->get_active;
                   $urpm->{options}{auto} = $box->get_active;
               },
@@ -663,7 +663,7 @@ sub run_treeview_dialog {
     if (!$>) {
         $check_boxes{$regexp_search_string}->set_active($use_regexp->[0]);
         $check_boxes{$NVR_string}->set_active($NVR_searches->[0]);
-        $check_boxes{$auto_select_string}->set_active($auto_select->[0]);
+        $check_boxes{$auto_select_string}->set_active($auto_select_opt->[0]);
         $check_boxes{$updates_string}->set_active($compute_updates->[0]);
         $check_boxes{$clean_cache_string}->set_active($clean_cache->[0]);
     }
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 1432869f..8dcd76f8 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -64,7 +64,7 @@ our @EXPORT = qw(
     $use_regexp
     $typical_width
     $clean_cache
-    $auto_select
+    $auto_select_opt
     add_distrib_update_media
     add_medium_and_check
     but
@@ -170,7 +170,7 @@ our $configfile = "$ENV{HOME}/.rpmdrake";
 our $clean_cache;
 
 # automatic select dependencies without user intervention
-our $auto_select;
+our $auto_select_opt;
 
 our ($changelog_first_config, $compute_updates, $filter, $max_info_in_descr, $mode, $NVR_searches, $tree_flat, $tree_mode, $use_regexp);
 our ($mandrakeupdate_wanted_categories, $ignore_debug_media, $offered_to_add_sources, $no_confirmation);
@@ -182,7 +182,7 @@ our %config = (
 	default => [ 0 ] 
     },
     auto_select => { 
-	var => \$auto_select, 
+	var => \$auto_select_opt,
 	default => [ 0 ] 
     },
     changelog_first_config => { var => \$changelog_first_config, default => [ 0 ] },
-- 
cgit v1.2.1