From 27bd7dbc989acdc6456b4a0b94d0fde5db138610 Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Tue, 5 Mar 2002 17:04:47 +0000
Subject: added auto restore of some files (/etc/profile) needed by upgrade
 (from .rpmnew).

---
 perl-install/install_steps.pm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'perl-install')

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 3864f8a06..e132b8f8c 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -2,7 +2,7 @@ package install_steps; # $Id$
 
 use diagnostics;
 use strict;
-use vars qw(@filesToSaveForUpgrade @ISA);
+use vars qw(@filesToSaveForUpgrade @filesNewerToUseAfterUpgrade @ISA);
 
 #-######################################################################################
 #- misc imports
@@ -26,6 +26,9 @@ use fs;
 /etc/ld.so.conf /etc/fstab /etc/hosts /etc/conf.modules /etc/modules.conf
 );
 
+@filesNewerToUseAfterUpgrade = qw(
+/etc/profile
+);
 
 #-######################################################################################
 #- OO Stuff
@@ -287,6 +290,9 @@ sub beforeInstallPackages {
 		eval { cp_af("$o->{prefix}/$_", "$o->{prefix}/$_.mdkgisave") };
 	    }
 	}
+	foreach (@filesNewerToUseAfterUpgrade) {
+	    unlink "$o->{prefix}/$_.rpmnew";
+	}
     }
 
     #- some packages need such files for proper installation.
@@ -491,6 +497,13 @@ GridHeight=70
 	    renamef("$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_.mdkgiorig")
 	      if -e "$o->{prefix}$_.mdkgisave";
 	}
+
+	foreach (@filesNewerToUseAfterUpgrade) {
+	    if (-e "$o->{prefix}/$_.rpmnew" && -e "$o->{prefix}/$_") {
+		renamef("$o->{prefix}/$_", "$o->{prefix}/$_.mdkgiorig");
+		renamef("$o->{prefix}/$_.rpmnew", "$o->{prefix}/$_");
+	    }
+	}
     }
 
     if ($o->{blank} || $o->{updatemodules}) {
-- 
cgit v1.2.1