From e892f90958b57404681cd7a38d1b8ebb37c40ae5 Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Mon, 14 Mar 2005 08:38:20 +0000
Subject: Don't die while upgrading if /var/ftp/pub/Mandrakelinux isn't there
 (bug #14585)

---
 perl-install/install_steps_gtk.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index ecaa846ae..c73f355d4 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -668,7 +668,7 @@ sub deselectFoundMedia {
     }
     if ($ask_copy_rpms_on_disk) {
 	#- don't be afraid, cleanup old RPMs if upgrade
-	rm_rf("$::prefix/var/ftp/pub/Mandrakelinux") if $o->{isUpgrade};
+	eval { rm_rf("$::prefix/var/ftp/pub/Mandrakelinux") if $o->{isUpgrade} };
 	my $w = ugtk2->new("");
 	$i = -1;
 	$w->sync;
-- 
cgit v1.2.1