diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-10 15:10:01 +0100 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-10 15:13:19 +0100 |
| commit | 263c1ab0a086fb8aac60d256d355b48e0e2293fb (patch) | |
| tree | 83c6c124fb4a4281f26bcc99d8b67da3923e18c2 | |
| parent | 45c31529768bcdee090c10453ff303595c2c6c35 (diff) | |
| download | perl-URPM-263c1ab0a086fb8aac60d256d355b48e0e2293fb.tar perl-URPM-263c1ab0a086fb8aac60d256d355b48e0e2293fb.tar.gz perl-URPM-263c1ab0a086fb8aac60d256d355b48e0e2293fb.tar.bz2 perl-URPM-263c1ab0a086fb8aac60d256d355b48e0e2293fb.tar.xz perl-URPM-263c1ab0a086fb8aac60d256d355b48e0e2293fb.zip | |
simplify (drop commented out message)
This message was never displayed:
see commit 66dd07d4237c6ee773c48c4c5a1471fdc25f8828
And anyway urpmi already takes care of warning about import errors
| -rw-r--r-- | URPM/Signature.pm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/URPM/Signature.pm b/URPM/Signature.pm index f1f0666..f72c087 100644 --- a/URPM/Signature.pm +++ b/URPM/Signature.pm @@ -74,12 +74,7 @@ sub import_needed_pubkeys_from_file { my ($kv) = grep { (hex($keyid) == hex($_->{id})) } @keys; my $imported; if (!$kv) { - if (!import_pubkey_file($db, $pubkey_file)) { - #$urpm->{debug_URPM}("Couldn't import public key from ".$pubkey_file) if $urpm->{debug_URPM}; - $imported = 0; - } else { - $imported = 1; - } + $imported = import_pubkey_file($db, $pubkey_file); @keys = parse_pubkeys_($db); ($kv) = grep { (hex($keyid) == hex($_->{id})) } @keys; } |