From e80c6bc54b1d64c53edf57f417bee30132e95d36 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 8 Mar 2006 12:36:02 +0000
Subject: - rename DOCS to CAT_MINIMAL_DOCS   - cuz otherwise DOCS is a
 "always" flag and modifying it afterwise is useless   - CAT_DOCS would be not
 precise enough - simplify the "changed" callback

---
 perl-install/install_any.pm               | 2 +-
 perl-install/install_steps_interactive.pm | 4 ++--
 perl-install/share/rpmsrate               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 6e65e8c0e..20f5e95f6 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -840,6 +840,7 @@ sub set_rpmsrate_category_flags {
     $o->{rpmsrate_flags_chosen}{$_} = 0 foreach grep { /^CAT_/ } keys %{$o->{rpmsrate_flags_chosen}};
     $o->{rpmsrate_flags_chosen}{"CAT_$_"} = 1 foreach map { @{$_->{flags}} } grep { $_->{selected} } @$compssUsers;
     $o->{rpmsrate_flags_chosen}{CAT_SYSTEM} = 1;
+    $o->{rpmsrate_flags_chosen}{CAT_MINIMAL_DOCS} = 1;
 }
 
 
@@ -850,7 +851,6 @@ sub rpmsrate_always_flags {
     $rpmsrate_flags_chosen->{qq(META_CLASS"$o->{meta_class}")} = 1;
     $rpmsrate_flags_chosen->{uc($_)} = 1 foreach grep { modules::probe_category("multimedia/$_") } modules::sub_categories('multimedia');
     $rpmsrate_flags_chosen->{uc($_)} = 1 foreach detect_devices::probe_name('Flag');
-    $rpmsrate_flags_chosen->{DOCS} = !$o->{excludedocs};
     $rpmsrate_flags_chosen->{UTF8} = $o->{locale}{utf8};
     $rpmsrate_flags_chosen->{BURNER} = 1 if detect_devices::burners();
     $rpmsrate_flags_chosen->{DVD} = 1 if detect_devices::dvdroms();
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 1b193c203..2a348fdea 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -582,14 +582,14 @@ Please choose the minimal installation you want:"),
 		      { val => \$docs, type => 'bool', text => N("With basic documentation (recommended!)"), disabled => sub { $minimal } },
 		      { val => \$minimal, type => 'bool', text => N("Truly minimal install (especially no urpmi)") },
 		     ],
-		     changed => sub { $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = 0 if $minimal },
 	) or return &chooseGroups;
 
 	if ($minimal) {
-	    $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = 0; #- redo it in "changed" was not called
+	    $o->{rpmsrate_flags_chosen}{CAT_X} = $docs = 0;
 	    $o->{rpmsrate_flags_chosen}{CAT_SYSTEM} = 0;
 	}
 	$o->{excludedocs} = !$docs;
+	$o->{rpmsrate_flags_chosen}{CAT_MINIMAL_DOCS} = $docs;
 
 	install_any::unselectMostPackages($o);
     }
diff --git a/perl-install/share/rpmsrate b/perl-install/share/rpmsrate
index aa2aa6fc1..06aa65257 100644
--- a/perl-install/share/rpmsrate
+++ b/perl-install/share/rpmsrate
@@ -661,7 +661,7 @@ CAT_X
   4 META_CLASS"server" mandriva-theme-Powerpack+
   4 META_CLASS"powerpack" mandriva-theme-Powerpack
 
-DOCS
+CAT_MINIMAL_DOCS
   5 man info man-pages
 
 CAT_SYSTEM
-- 
cgit v1.2.1