diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-08-17 05:49:12 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-08-17 05:49:12 +0000 |
| commit | 5076cca8105bbb7b334a1d2004db6716428cd7b4 (patch) | |
| tree | 0becaa50211e0abb18b12d923908a7fdf4610bb8 | |
| parent | 354186e210c550f7d7627d61ef02466c6b3d35bd (diff) | |
| download | drakx-5076cca8105bbb7b334a1d2004db6716428cd7b4.tar drakx-5076cca8105bbb7b334a1d2004db6716428cd7b4.tar.gz drakx-5076cca8105bbb7b334a1d2004db6716428cd7b4.tar.bz2 drakx-5076cca8105bbb7b334a1d2004db6716428cd7b4.tar.xz drakx-5076cca8105bbb7b334a1d2004db6716428cd7b4.zip | |
get release_notes at beginning of install_steps_interactive::acceptLicense(), even when useless_thing_accepted
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 7 |
2 files changed, 8 insertions, 1 deletions
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 ? |