diff options
| author | Thierry Vignaud <tv@mandriva.org> | 2008-08-28 14:28:01 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mandriva.org> | 2008-08-28 14:28:01 +0000 |
| commit | 443bf8e673acc4d83fb3f710bc341fb0dcfe9513 (patch) | |
| tree | de198024e22a9b3e58e44709fbd19b74090b1304 | |
| parent | a4336664d4635b5f94a90bc20f36f46353ef02de (diff) | |
| download | drakx-443bf8e673acc4d83fb3f710bc341fb0dcfe9513.tar drakx-443bf8e673acc4d83fb3f710bc341fb0dcfe9513.tar.gz drakx-443bf8e673acc4d83fb3f710bc341fb0dcfe9513.tar.bz2 drakx-443bf8e673acc4d83fb3f710bc341fb0dcfe9513.tar.xz drakx-443bf8e673acc4d83fb3f710bc341fb0dcfe9513.zip | |
(acceptLicense,display_release_notes) fix displaying release notes in text mode (#43263)
| -rw-r--r-- | perl-install/any.pm | 13 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index 950801158..ab8a3ea6b 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -865,6 +865,12 @@ sub autologin { sub display_release_notes { my ($o) = @_; + if (!$o->isa('interactive::gtk')) { + $o->ask_from_({ title => N("Release Notes"), + messages => $o->{release_notes}, #formatAlaTeX(messages::main_license()), + }, [ {} ]); + return; + } require Gtk2::Html2; require ugtk2; ugtk2->import(':all'); @@ -901,7 +907,10 @@ sub acceptLicense { my ($o) = @_; require messages; - $o->{release_notes} = join("\n\n", grep { $_ } map { + my $ext = $o->isa('interactive::gtk') ? '.html' : '.txt'; + my $separator = $o->isa('interactive::gtk') ? "\n\n" : ''; + + $o->{release_notes} = join($separator, grep { $_ } map { if ($::isInstall) { my $f = install::any::getFile_($o->{stage2_phys_medium}, $_); $f && cat__($f); @@ -910,7 +919,7 @@ sub acceptLicense { my $d = find { -e "$_/$file" } glob_("/usr/share/doc/*-release-*"); $d && cat_("$d/$file"); } - } 'release-notes.html', 'release-notes.' . arch() . '.html'); + } "release-notes$ext", 'release-notes.' . arch() . $ext); # we do not handle links: $o->{release_notes} =~ s!<a href=".*?">(.*?)</a>!$1!g; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 564f80d31..90279b971 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,5 +1,7 @@ - configure vga=785 (640x480) when vga=788 (800x600) fails during install (useful on 800x480 netbooks) +- text mode: + o fix displaying release notes in (#43263) Version 11.26.1 - 28 August 2008 |