From 27386d7f027488629d40c23492c734fbba727fa1 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 17 Mar 2005 17:09:37 +0000
Subject: simplify

---
 perl-install/install_steps_interactive.pm | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'perl-install/install_steps_interactive.pm')

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};
 
-- 
cgit v1.2.1