summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-17 15:53:59 +0000
committerGwenolé Beauchesne <gbeauchesne@mandriva.org>2005-03-17 15:53:59 +0000
commitf7fd2cc0a44b8bef643e51b9331b4382c408c29c (patch)
tree0dbb2ab7c8ebe9e60f4b3cef67f78172061a6dd8
parent6ff7938effbe8137975304b68423ed5c93124d6b (diff)
downloaddrakx-f7fd2cc0a44b8bef643e51b9331b4382c408c29c.tar
drakx-f7fd2cc0a44b8bef643e51b9331b4382c408c29c.tar.gz
drakx-f7fd2cc0a44b8bef643e51b9331b4382c408c29c.tar.bz2
drakx-f7fd2cc0a44b8bef643e51b9331b4382c408c29c.tar.xz
drakx-f7fd2cc0a44b8bef643e51b9331b4382c408c29c.zip
MERGE: make it possible to read arch-specific release notes in addition to
global (default) ones
-rw-r--r--perl-install/install_steps_interactive.pm4
1 files 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};