From f7fd2cc0a44b8bef643e51b9331b4382c408c29c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gwenol=C3=A9=20Beauchesne?= <gbeauchesne@mandriva.org>
Date: Thu, 17 Mar 2005 15:53:59 +0000
Subject: MERGE: make it possible to read arch-specific release notes in
 addition to global (default) ones

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

diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 293b5e8e3..70c21d629 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -74,8 +74,8 @@ sub acceptLicense {
     my ($o) = @_;
 
     $o->{release_notes} = do {
-	my $f = install_any::getFile('release-notes.txt');
-	join('', <$f>);
+	my $af = install_any::getFile("release-notes.". arch().".txt");
+	join('', <$f>, $af ? ("\n\n", <$af>) : ());
     };
 
     return if $o->{useless_thing_accepted};
-- 
cgit v1.2.1