summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-09-19 18:20:50 +0000
committerThierry Vignaud <tv@mageia.org>2011-09-19 18:20:50 +0000
commit6d5b3a35b85730153f9ebf361b7456791e7f8c79 (patch)
tree8dfc9ba7a466f9b9cf1a6d18afe66f1e1c414cc9
parent1091dc6cf8c86f30a6270b1d4f349ff7f92c5873 (diff)
downloaddrakx-6d5b3a35b85730153f9ebf361b7456791e7f8c79.tar
drakx-6d5b3a35b85730153f9ebf361b7456791e7f8c79.tar.gz
drakx-6d5b3a35b85730153f9ebf361b7456791e7f8c79.tar.bz2
drakx-6d5b3a35b85730153f9ebf361b7456791e7f8c79.tar.xz
drakx-6d5b3a35b85730153f9ebf361b7456791e7f8c79.zip
(bad_signature) simplify
-rw-r--r--perl-install/install/pkgs.pm7
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/install/pkgs.pm b/perl-install/install/pkgs.pm
index bfb039690..5be19d91f 100644
--- a/perl-install/install/pkgs.pm
+++ b/perl-install/install/pkgs.pm
@@ -798,11 +798,8 @@ sub _install_raw {
$msg =~ s/:$/\n\n/m; # FIXME: to be fixed in urpmi after 2008.0 (sic!)
log::l($msg);
log::l($msg2);
- if ($packages->{options}{auto}) {
- 0;
- } else {
- $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2");
- }
+ return 0 if $packages->{options}{auto};
+ $::o->ask_yesorno(N("Warning"), "$msg\n\n$msg2");
},
copy_removable => sub {
my ($medium) = @_;