summaryrefslogtreecommitdiffstats
path: root/perl-install/crypto.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-01-04 17:34:35 +0000
committerFrancois Pons <fpons@mandriva.com>2002-01-04 17:34:35 +0000
commit883e070b411abc63e7ab89efe88cbc51e320c139 (patch)
tree803ac0cfd45a815699b4f69f04d79b6a9776f7de /perl-install/crypto.pm
parent6ea016b32d565af4c2be937295792089aeb56d9d (diff)
downloaddrakx-883e070b411abc63e7ab89efe88cbc51e320c139.tar
drakx-883e070b411abc63e7ab89efe88cbc51e320c139.tar.gz
drakx-883e070b411abc63e7ab89efe88cbc51e320c139.tar.bz2
drakx-883e070b411abc63e7ab89efe88cbc51e320c139.tar.xz
drakx-883e070b411abc63e7ab89efe88cbc51e320c139.zip
allow to use same identifier for security medium (1u).
re-install urpmi. allow some error to be catched.
Diffstat (limited to 'perl-install/crypto.pm')
-rw-r--r--perl-install/crypto.pm22
1 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index cb6517536..89ff9474d 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -85,16 +85,18 @@ sub getPackages {
$crypto::host = $mirror;
#- extract hdlist of crypto, then depslist.
- require pkgs;
- my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz",
- 1+scalar(keys %{$packages->{mediums}}), "RPMS",
- #"Updates for Mandrake Linux $::VERSION", 1, getFile("base/hdlist.cz", $mirror)) and
- "Updates for Mandrake Linux 8.1", 1, getFile("base/hdlist.cz", $mirror)) and
- log::l("read updates hdlist");
- #- keep in mind where is the URL prefix used according to mirror (for install_any::install_urpmi).
- $update_medium->{prefix} = dir($mirror);
-
- return $update_medium;
+ eval {
+ require pkgs;
+ my $update_medium = pkgs::psUsingHdlist($prefix, 'ftp', $packages, "hdlist-updates.cz", "1u", "RPMS",
+ #"Updates for Mandrake Linux $::VERSION", 1, getFile("base/hdlist.cz", $mirror)) and
+ "Updates for Mandrake Linux 8.1", 1, getFile("base/hdlist.cz", $mirror)) and
+ log::l("read updates hdlist");
+ #- keep in mind where is the URL prefix used according to mirror (for install_any::install_urpmi).
+ $update_medium->{prefix} = dir($mirror);
+
+ return $update_medium;
+ };
+ return; #- an exception occurred, so ignore it.
}
sub get {