summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2013-05-13 20:07:04 +0000
committerThomas Backlund <tmb@mageia.org>2013-05-13 20:07:04 +0000
commitf811629c672dc9b4c9e39b03cbfb7bde239126e8 (patch)
treed049ff5ee84ce1ec6ee1483aa1814b3f4a75e3f7
parent92394a74cd88fc303ded7d598360e20176bd5d2b (diff)
downloaddrakx-f811629c672dc9b4c9e39b03cbfb7bde239126e8.tar
drakx-f811629c672dc9b4c9e39b03cbfb7bde239126e8.tar.gz
drakx-f811629c672dc9b4c9e39b03cbfb7bde239126e8.tar.bz2
drakx-f811629c672dc9b4c9e39b03cbfb7bde239126e8.tar.xz
drakx-f811629c672dc9b4c9e39b03cbfb7bde239126e8.zip
any.pm: dont add arch() to release-notes file name (#10087)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/any.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 1d442eef6..ca7135c1b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- any.pm: dont add arch() to release-notes file name (#10087)
- finish-install: enable Nonfree/Tainted repositories if a package
having a matching name is installed (#8379)
- detect_devices: check for phy80211 sysfs directory as well to detect
diff --git a/perl-install/any.pm b/perl-install/any.pm
index f153c1fb1..0e931ff4c 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -1068,7 +1068,7 @@ sub get_release_notes {
my $d = find { -e "$_/$file" } glob_("/usr/share/doc/*-release-*");
$d && cat_("$d/$file");
}
- } "release-notes$ext", 'release-notes.' . arch() . $ext);
+ } "release-notes$ext", 'release-notes.' . $ext);
# we do not handle links:
$release_notes =~ s!<a href=".*?">(.*?)</a>!$1!g;