summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-12 11:45:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-12 11:45:10 +0000
commitcb794de1c684ea088862c36d5638ecf8bb116be2 (patch)
tree34f040c0a9fea6cd83258d06a9a3cc857edeb21d
parent82cc24bda12c5204c96bbd5f1f8bcff5e59b896b (diff)
downloaddrakx-cb794de1c684ea088862c36d5638ecf8bb116be2.tar
drakx-cb794de1c684ea088862c36d5638ecf8bb116be2.tar.gz
drakx-cb794de1c684ea088862c36d5638ecf8bb116be2.tar.bz2
drakx-cb794de1c684ea088862c36d5638ecf8bb116be2.tar.xz
drakx-cb794de1c684ea088862c36d5638ecf8bb116be2.zip
fix looking for backup-ed release file first
-rw-r--r--perl-install/common.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index e5a1a6693..36628d900 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -237,9 +237,11 @@ sub set_permissions {
sub release_file {
my ($o_dir) = @_;
- find { -r "$o_dir$_" }
- map { ("/root/drakx/$_.upgrading", "/etc/$_") }
- 'mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release';
+ my @names = ('mandrakelinux-release', 'mandrake-release', 'conectiva-release', 'release', 'redhat-release');
+ find { -r "$o_dir$_" } (
+ (map { "/root/drakx/$_.upgrading" } @names),
+ (map { "/etc/$_" } @names),
+ );
}
sub mandrake_release {