diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-02 06:24:59 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-09-02 06:24:59 +0000 |
| commit | 4e1f5f18db58f641c2b7019ff0817b65ddbb35a5 (patch) | |
| tree | e8fc47270114120cc0467eb0c9fbac0c41e38b58 | |
| parent | ff224f1d77c69c6661f32127e59d53211c5074d3 (diff) | |
| download | drakx-4e1f5f18db58f641c2b7019ff0817b65ddbb35a5.tar drakx-4e1f5f18db58f641c2b7019ff0817b65ddbb35a5.tar.gz drakx-4e1f5f18db58f641c2b7019ff0817b65ddbb35a5.tar.bz2 drakx-4e1f5f18db58f641c2b7019ff0817b65ddbb35a5.tar.xz drakx-4e1f5f18db58f641c2b7019ff0817b65ddbb35a5.zip | |
If a supplementary media is incorrect, continue asking
| -rw-r--r-- | perl-install/install_any.pm | 2 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index af60fd099..b2654aeae 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -479,7 +479,7 @@ sub selectSupplMedia { log::l($@) if $@; $o->ask_warn('', N("Can't find hdlist file on this mirror")); useMedium($prev_asked_medium); - return ''; + return 'error'; } my $supplmedium = pkgs::psUsingHdlist( $o->{prefix}, diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index b86df87a3..51b3e241d 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -599,7 +599,8 @@ sub read_rpmsrate { sub readCompssUsers { my ($meta_class, $file) = @_; - my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) or die "can't find $file"; + my $f = $meta_class && install_any::getFile("$file.$meta_class") || install_any::getFile($file) + or do { log::l("can't find $file: $!"); return (undef, undef) }; my ($compssUsers, $gtk_display_compssUsers) = eval join('', <$f>); if ($@) { log::l("ERROR: bad $file: $@"); |