summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-19 18:20:56 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-19 18:20:56 +0000
commit359a4538f51e88e41fbb613b9fa1f2aa47d17401 (patch)
treeb11d3e7bd465db5a2da349b649302a4d84802420 /perl-install
parentedb786990098c4f30b4c5d54680ccc232f04c395 (diff)
downloaddrakx-359a4538f51e88e41fbb613b9fa1f2aa47d17401.tar
drakx-359a4538f51e88e41fbb613b9fa1f2aa47d17401.tar.gz
drakx-359a4538f51e88e41fbb613b9fa1f2aa47d17401.tar.bz2
drakx-359a4538f51e88e41fbb613b9fa1f2aa47d17401.tar.xz
drakx-359a4538f51e88e41fbb613b9fa1f2aa47d17401.zip
(bad_signature) offer not to ask again about bad signatures
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/install/NEWS1
-rw-r--r--perl-install/install/pkgs.pm9
2 files changed, 9 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index ffd8bd780..788641432 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -4,6 +4,7 @@
than Mageia
- install perl-Hal-Cdroms for urpmi when needed
- default to systemd (through "init=/bin/systemd")
+- offer not to ask again about bad signatures
Version 13.64 - 08 September 2011
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index 5be19d91f..c7c279e1c 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -1,6 +1,7 @@
package install::pkgs; # $Id: pkgs.pm 267288 2010-04-02 14:49:40Z pterjan $
use strict;
+use feature 'state';
BEGIN {
# needed before "use URPM"
@@ -799,7 +800,13 @@ sub _install_raw {
log::l($msg);
log::l($msg2);
return 0 if $packages->{options}{auto};
- $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2");
+ 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"),
+ },
+ ]);
},
copy_removable => sub {
my ($medium) = @_;