From d39a2a6574b0506ada086f096b05b80e9b156ec2 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 13 Mar 2001 00:05:51 +0000
Subject: renamef created and used

---
 perl-install/install_steps.pm | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 598cada9c..06137b3cb 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -343,15 +343,13 @@ sub installPackages($$) { #- complete REWORK, TODO and TOCHECK!
 	#- important files and restore them after.
 	foreach (@{$o->{toSave} || []}) {
 	    if (-e "$o->{prefix}/$_") {
-		unlink "$o->{prefix}/$_.mdkgisave"; 
-		eval { commands::cp("$o->{prefix}/$_", "$o->{prefix}/$_.mdkgisave") };
+		eval { commands::cp("-f", "$o->{prefix}/$_", "$o->{prefix}/$_.mdkgisave") };
 	    }
 	}
 	pkgs::remove($o->{prefix}, $o->{toRemove});
 	foreach (@{$o->{toSave} || []}) {
 	    if (-e "$o->{prefix}/$_.mdkgisave") {
-		unlink "$o->{prefix}/$_"; 
-		rename "$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_";
+		renamef("$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_");
 	    }
 	}
 	$o->{toSave} = [];
@@ -480,9 +478,8 @@ GridHeight=70
 	install_any::kdemove_desktop_file($o->{prefix});
 
 	foreach (@filesToSaveForUpgrade) {
-	    if (-e "$o->{prefix}$_.mdkgisave") {
-		unlink "$o->{prefix}$_.mdkgiorig"; rename "$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_.mdkgiorig";
-	    }
+	    renamef("$o->{prefix}/$_.mdkgisave", "$o->{prefix}/$_.mdkgiorig")
+	      if -e "$o->{prefix}$_.mdkgisave";
 	}
     }
 }
-- 
cgit v1.2.1