summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Scherer <misc@mageia.org>2011-05-23 13:20:35 +0000
committerMichael Scherer <misc@mageia.org>2011-05-23 13:20:35 +0000
commitbc3f5c62219505ee5dde74901947f998fe7bdd36 (patch)
tree87b95eb13b8e68e4f578ffe29ff5f4b2c84638ee
parent2561796b5edf0bfb127cf24df140543c736a4532 (diff)
downloaddrakx-bc3f5c62219505ee5dde74901947f998fe7bdd36.tar
drakx-bc3f5c62219505ee5dde74901947f998fe7bdd36.tar.gz
drakx-bc3f5c62219505ee5dde74901947f998fe7bdd36.tar.bz2
drakx-bc3f5c62219505ee5dde74901947f998fe7bdd36.tar.xz
drakx-bc3f5c62219505ee5dde74901947f998fe7bdd36.zip
also take mandriva-release file in account in common::release_file for consistency with others distributions
-rw-r--r--perl-install/common.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 3b4582b9d..fb42180c7 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -344,7 +344,7 @@ sub parse_release_file {
sub release_file {
my ($o_dir) = @_;
- my @names = ('mageia-release', 'mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release');
+ my @names = ('mageia-release', 'mandriva-release', 'mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release', 'fedora-release', 'SuSE-release');
find { -r "$o_dir$_" } (
(map { "/root/drakx/$_.upgrading" } @names),
(map { "/etc/$_" } @names),