diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-04-18 17:08:49 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-04-18 17:08:49 +0000 |
| commit | 8050b798895c1c70dc79b7f0301da17035fdd77b (patch) | |
| tree | 94d848fb430f8eea9857036307829e3a67a69b6f /perl-install | |
| parent | d63107502b79b30d0469262ad74cc1c5f61557f3 (diff) | |
| download | drakx-8050b798895c1c70dc79b7f0301da17035fdd77b.tar drakx-8050b798895c1c70dc79b7f0301da17035fdd77b.tar.gz drakx-8050b798895c1c70dc79b7f0301da17035fdd77b.tar.bz2 drakx-8050b798895c1c70dc79b7f0301da17035fdd77b.tar.xz drakx-8050b798895c1c70dc79b7f0301da17035fdd77b.zip | |
(_install_raw::bad_signature) fix assuming "no" to continue on bad
signatures once "do not ask again" has been checked in
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/pkgs.pm | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 1e986a153..52b90e315 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,6 +1,8 @@ - fix lock icon - show again package descriptions in individual package list (mga#549) - package installation: + o fix assuming "no" to continue on bad signatures once "do not ask + again" has been checked in o unselect already suggested packages when performing a minimal install if "no suggests" option was choosen (mga#5209) diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm index e4caaeb0d..348201c10 100644 --- a/perl-install/install/pkgs.pm +++ b/perl-install/install/pkgs.pm @@ -836,12 +836,13 @@ sub _install_raw { log::l($msg2); return 0 if $packages->{options}{auto}; state $do_not_ask; - return if $do_not_ask; - $::o->ask_from_({ messages => "$msg\n\n$msg2" }, [ - { val => \$do_not_ask, - type => 'bool', text => N("Do not ask again"), - }, - ]); + state $answer; + return $answer if $do_not_ask; + $answer = $::o->ask_from_({ messages => "$msg\n\n$msg2" }, [ + { val => \$do_not_ask, + type => 'bool', text => N("Do not ask again"), + }, + ]); }, copy_removable => sub { my ($medium) = @_; |