summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2014-03-28 21:14:22 +0100
committerThierry Vignaud <thierry.vignaud@gmail.com>2014-03-28 21:14:22 +0100
commitb6435692a67adeef743fbca6677931b3e83370a8 (patch)
tree721ce6ab0b97ff600d668c1c6a527c75adc7ade9
parentad883daff79012d8eff49dd12af3aaf65b2c87ae (diff)
downloadcontrol-center-b6435692a67adeef743fbca6677931b3e83370a8.tar
control-center-b6435692a67adeef743fbca6677931b3e83370a8.tar.gz
control-center-b6435692a67adeef743fbca6677931b3e83370a8.tar.bz2
control-center-b6435692a67adeef743fbca6677931b3e83370a8.tar.xz
control-center-b6435692a67adeef743fbca6677931b3e83370a8.zip
fix not displaying contributors in about dialog (mga#13093)
access to CREDITS was wrongly removed in befd324a2ef5f487e788bc6ed6c5de0dd7a9d751
-rw-r--r--NEWS2
-rwxr-xr-xcontrol-center2
2 files changed, 3 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 6ecd87de..511158b4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- fix not displaying contributors in about dialog (mga#13093)
+
Version 12.51 - 25 January 2014, Colin Guthrie
- do not exec pkexec but run it so it has a parent process to fix double fork
diff --git a/control-center b/control-center
index f0ff8c4c..b56e93ba 100755
--- a/control-center
+++ b/control-center
@@ -1450,7 +1450,7 @@ sub about_mga_cc() {
my ($previous_type, $not_first_title, $not_first_block);
my $locale = lang::read;
require Gtk2::Pango;
- foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mageia-release-*/CREDITS.$locale->{lang}")))) {
+ foreach my $line (grep { $_ ne "\n" && !/^#/ } cat_(top(glob("/usr/share/doc/mageia-release-*/CREDITS"), glob("/usr/share/doc/mageia-release-*/CREDITS.$locale->{lang}")))) {
if (my ($type, $comment, $contributor) = split(/\|/, $line, 3)) {
last if !$type;
$comment =~ s/^ //; # fix initial space of first section (CREDITS format should be enhanced to specify lines that really are sections)