summaryrefslogtreecommitdiffstats
path: root/perl-install/install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-08-05 19:12:20 +0000
committerThierry Vignaud <tv@mageia.org>2011-08-05 19:12:20 +0000
commitce7859b540ed5653d46aee5a7fcbded10492b2e7 (patch)
tree033e405ced0ac8f80b95f8a7b2c9d36ce7be72ef /perl-install/install
parent7528b5e5782d76e59a2ec17af793b07089426695 (diff)
downloaddrakx-ce7859b540ed5653d46aee5a7fcbded10492b2e7.tar
drakx-ce7859b540ed5653d46aee5a7fcbded10492b2e7.tar.gz
drakx-ce7859b540ed5653d46aee5a7fcbded10492b2e7.tar.bz2
drakx-ce7859b540ed5653d46aee5a7fcbded10492b2e7.tar.xz
drakx-ce7859b540ed5653d46aee5a7fcbded10492b2e7.zip
(choosePackages) do not crash if there's no mirror cache to erase
Diffstat (limited to 'perl-install/install')
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/install/steps.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 74f93745e..6fa8c76de 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- do not crash if there's no mirror cache to erase
+
Version 13.61 - 01 August 2011
- clear the mirror cache before upgrading (#1557)
diff --git a/perl-install/install/steps.pm b/perl-install/install/steps.pm
index 86421be43..5bb9499c9 100644
--- a/perl-install/install/steps.pm
+++ b/perl-install/install/steps.pm
@@ -259,7 +259,7 @@ sub choosePackages {
my ($o, $o_compssListLevel) = @_;
#- clear the mirror cache before upgrading:
- rm_rf("$::prefix/var/cache/urpmi/mirrors.cache");
+ eval { rm_rf("$::prefix/var/cache/urpmi/mirrors.cache") };
#- now for upgrade, package that must be upgraded are
#- selected first, after is used the same scheme as install.