From cb794de1c684ea088862c36d5638ecf8bb116be2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 12 Sep 2005 11:45:10 +0000
Subject: fix looking for backup-ed release file first

---
 perl-install/common.pm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'perl-install/common.pm')

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 {
-- 
cgit v1.2.1