From 5cc1f42d9cd129bd678fe5bbc97e0c9877d8f1d3 Mon Sep 17 00:00:00 2001 From: Rafael Garcia-Suarez Date: Thu, 16 Sep 2004 05:12:03 +0000 Subject: Better retry on error handling for supplementary media --- perl-install/install_any.pm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 7fc1559b1..022db2e54 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -504,11 +504,11 @@ sub selectSupplMedia { my $url; local $global_ftp_prefix; if ($suppl_method eq 'ftp') { #- mirrors are ftp only (currently) - $url = $o->askSupplMirror(N("URL of the mirror?")) or return ''; + $url = $o->askSupplMirror(N("URL of the mirror?")) or return 'error'; $url =~ m!^ftp://(?:(.*?)(?::(.*?))?@)?([^/]+)/(.*)! and $global_ftp_prefix = [ $3, $4, $1, $2 ]; #- for getFile } else { - $url = $o->ask_from_entry('', N("URL of the mirror?")) or return ''; + $url = $o->ask_from_entry('', N("URL of the mirror?")) or return 'error'; } useMedium($medium_name); require "$suppl_method.pm"; #- require http or ftp @@ -554,6 +554,7 @@ sub selectSupplMedia { setup_suppl_medium($supplmedium, $url, $suppl_method); } else { log::l("no suppl hdlist"); + $suppl_method = 'error'; } } } else { -- cgit v1.2.1