From 5076cca8105bbb7b334a1d2004db6716428cd7b4 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 17 Aug 2004 05:49:12 +0000
Subject: get release_notes at beginning of
 install_steps_interactive::acceptLicense(), even when useless_thing_accepted

---
 perl-install/install2.pm                  | 2 +-
 perl-install/install_steps_interactive.pm | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index bad07fac9..3af6d13f8 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -94,7 +94,7 @@ sub selectLanguage {
 
 sub acceptLicense {
     my ($_clicked, $_ent_number, $auto) = @_;
-    installStepsCall($o, $auto, 'acceptLicense') if !$o->{useless_thing_accepted};
+    installStepsCall($o, $auto, 'acceptLicense');
 }
 
 #------------------------------------------------------------------------------
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a059f92b0..6fd0462b9 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -74,6 +74,13 @@ so the messages will be displayed in english during installation") if $ENV{LANGU
 sub acceptLicense {
     my ($o) = @_;
 
+    $o->{release_notes} = do {
+	my $f = install_any::getFile('release-notes.txt');
+	join('', <$f>);
+    };
+
+    return if $o->{useless_thing_accepted};
+
     my $r = $::testing ? 'Accept' : 'Refuse';
 
     ($::recovery ?
-- 
cgit v1.2.1