diff options
| author | Olivier Blin <oblin@mandriva.com> | 2009-04-15 14:29:38 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2009-04-15 14:29:38 +0000 |
| commit | 2d25701dfbd768bf37473c4289368badcaa93034 (patch) | |
| tree | 72e71029395e4e76a9f3ddf27e03579ba7b82b59 | |
| parent | f650272fb62fb2ff96a88c0f0dcf971d472d3022 (diff) | |
| download | drakx-2d25701dfbd768bf37473c4289368badcaa93034.tar drakx-2d25701dfbd768bf37473c4289368badcaa93034.tar.gz drakx-2d25701dfbd768bf37473c4289368badcaa93034.tar.bz2 drakx-2d25701dfbd768bf37473c4289368badcaa93034.tar.xz drakx-2d25701dfbd768bf37473c4289368badcaa93034.zip | |
do not crash when encountering bad signatures in automatic install
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 08daa16a1..9d461193a 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,7 @@ - include mount.ntfs-3g in install and rescue - add various command to rescue - display an error when mount fails during View action +- do not crash when encountering bad signatures in automatic install Version 12.27 - 14 April 2009 diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index 188e81f05..c933cfd56 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -763,7 +763,11 @@ sub _install_raw { $msg =~ s/:$/\n\n/m; # FIXME: to be fixed in urpmi after 2008.0 (sic!) log::l($msg); log::l($msg2); - $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2"); + if ($packages->{options}{auto}) { + 0; + } else { + $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2"); + } }, copy_removable => sub { my ($medium) = @_; |