diff options
| author | Francois Pons <fpons@mandriva.com> | 2000-04-12 16:24:38 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2000-04-12 16:24:38 +0000 |
| commit | 66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9 (patch) | |
| tree | 6d77284d9a28c49aa171acb2679b1328c40f9f29 | |
| parent | f767bf7493bd00eae8719d5c590ef0c7366fe59a (diff) | |
| download | drakx-66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9.tar drakx-66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9.tar.gz drakx-66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9.tar.bz2 drakx-66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9.tar.xz drakx-66b03c87eb3e94bd4eb764d97cd7aaf3ca7f52f9.zip | |
*** empty log message ***
| -rw-r--r-- | perl-install/install_steps_gtk.pm | 4 | ||||
| -rw-r--r-- | perl-install/pkgs.pm | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm index 889c4060d..933ac8368 100644 --- a/perl-install/install_steps_gtk.pm +++ b/perl-install/install_steps_gtk.pm @@ -517,6 +517,10 @@ to avoid installation from this Cd-Rom image.", $medium_msg{$medium}); $o->ask_yesorno('', [ _("There was an error ordering packages:"), $1, _("Go on anyway?") ], 1) and return 1; ${$_[0]} = "already displayed"; + } elsif ($@ =~ /^error installing package list: (.*)/) { + $o->ask_yesorno('', [ +_("There was an error installing packages:"), $1, _("Go on anyway?") ], 1) and return 1; + ${$_[0]} = "already displayed"; } 0; }; diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm index 550e4cc26..4acc279f8 100644 --- a/perl-install/pkgs.pm +++ b/perl-install/pkgs.pm @@ -319,7 +319,7 @@ sub psUsingHdlists { chomp; s/\s*#.*$//; /^\s*$/ and next; - m/^hdlist(.*)\.cz\s*(.*)$/ or die "invalid hdlist filename $_"; + m/^hdlist(.*)\.cz2?\s*(.*)$/ or die "invalid hdlist filename $_"; push @hdlists, [ $_, $1, $2 ]; } @@ -925,7 +925,7 @@ sub install($$$;$$) { my @badpkgs = map { $_->{file} } grep { !packageFlagInstalled($_) } @transToInstall; @badpkgs > 0 and - cdie _("The following packages have not been installed because of errors: %s", join("\n", @badpkgs)), sub { + cdie "error installing package list: " . join("\n", @badpkgs), sub { &$close(); c::rpmdbClose($db); }; |