summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-03-17 17:09:37 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-03-17 17:09:37 +0000
commit27386d7f027488629d40c23492c734fbba727fa1 (patch)
treec1556ee23eb71356510cfe2f50a6d2daeca4576f
parentde0207f0c547c575ccaee5b60796583fd8534408 (diff)
downloaddrakx-27386d7f027488629d40c23492c734fbba727fa1.tar
drakx-27386d7f027488629d40c23492c734fbba727fa1.tar.gz
drakx-27386d7f027488629d40c23492c734fbba727fa1.tar.bz2
drakx-27386d7f027488629d40c23492c734fbba727fa1.tar.xz
drakx-27386d7f027488629d40c23492c734fbba727fa1.zip
simplify
-rw-r--r--perl-install/install_steps_interactive.pm9
1 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 58f176d09..698889121 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -73,11 +73,10 @@ 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');
- my $af = install_any::getFile("release-notes." . arch() . ".txt");
- join('', <$f>, $af ? ("\n\n", <$af>) : ());
- };
+ $o->{release_notes} = join("\n\n", map {
+ my $f = install_any::getFile($_);
+ $f && cat__($f);
+ } 'release-notes.txt', 'release-notes.' . arch() . '.txt');
return if $o->{useless_thing_accepted};