summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-14 08:38:20 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2005-03-14 08:38:20 +0000
commite892f90958b57404681cd7a38d1b8ebb37c40ae5 (patch)
treea8b18f284d29fd4cd7b4ce907cdc3d6eead70e01
parent22a5950f14499c4ca4a7a18b7766b5e2b559bb6e (diff)
downloaddrakx-e892f90958b57404681cd7a38d1b8ebb37c40ae5.tar
drakx-e892f90958b57404681cd7a38d1b8ebb37c40ae5.tar.gz
drakx-e892f90958b57404681cd7a38d1b8ebb37c40ae5.tar.bz2
drakx-e892f90958b57404681cd7a38d1b8ebb37c40ae5.tar.xz
drakx-e892f90958b57404681cd7a38d1b8ebb37c40ae5.zip
Don't die while upgrading if /var/ftp/pub/Mandrakelinux isn't there (bug #14585)
-rw-r--r--perl-install/install_steps_gtk.pm2
1 files changed, 1 insertions, 1 deletions
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;